mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

More sanity checking

Browse Source
This commit is contained in:
Bryan Haase 2011-07-22 09:18:20 -05:00
parent 64f3141f5f
commit e9ccd9b1cb
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etc/inc/vpn.inc
View File

@ -420,22 +420,29 @@ function vpn_ipsec_configure($ipchg = false)
}
/* end mode_cfg section */
/* begin ldapcfg */
$authcfg = $config['system']['authserver'][0];
if ($a_client['user_source'] = "ldap")
{
foreach ($config['system']['authserver'] as $authcfg) {
if ($authcfg['type'] == 'ldap') {
$thisauthcfg = $authcfg;
}
}
/* begin ldapcfg */
$racoonconf .= "ldapcfg {\n";
$racoonconf .= "\tversion 3;\n";
$racoonconf .= "\thost \"".$authcfg['host']."\";\n";
$racoonconf .= "\thost \"".$thisauthcfg['host']."\";\n";
$lport = "389";
if ($authcfg['port'] != "") {$lport = $authcfg['port'];};
$racoonconf .= "\tport ".$lport.";\n";
$racoonconf .= "\tbase \"".$authcfg['ldap_basedn']."\";\n";
$racoonconf .= "\tbase \"".$thisauthcfg['ldap_basedn']."\";\n";
$racoonconf .= "\tsubtree on;\n";
$racoonconf .= "\tbind_dn \"".$authcfg['ldap_binddn']."\";\n";
$racoonconf .= "\tbind_pw \"".$authcfg['ldap_bindpw']."\";\n";
$racoonconf .= "\tattr_user \"".$authcfg['ldap_attr_user']."\";\n";
$racoonconf .= "\tbind_dn \"".$thisauthcfg['ldap_binddn']."\";\n";
$racoonconf .= "\tbind_pw \"".$thisauthcfg['ldap_bindpw']."\";\n";
$racoonconf .= "\tattr_user \"".$thisauthcfg['ldap_attr_user']."\";\n";
$racoonconf .= "}\n\n";
/* end ldapcfg */
/* end ldapcfg */
}
/* begin remote sections */
if (is_array($a_phase1) && count($a_phase1)) {
/* begin remote */

8
usr/local/www/vpn_ipsec_mobile.php
View File

@ -355,7 +355,13 @@ function login_banner_change() {
<td width="78%" class="vtable">
<?=gettext("Source"); ?>:&nbsp;&nbsp;
<select name="user_source" class="formselect" id="user_source">
<option value="ldap"><?=gettext("ldap"); ?></option>
<?
foreach ($config['system']['authserver'] as $authcfg) {
if ($authcfg['type'] == 'ldap') {
print '<option value="ldap">ldap</option>';
}
}
?>
<option value="system"><?=gettext("system"); ?></option>
</select>
</td>