diff options
| author | Bryan Haase <bryan.haase@gmail.com> | 2011-07-22 09:18:20 -0500 |
|---|---|---|
| committer | Bryan Haase <bryan.haase@gmail.com> | 2011-07-22 09:18:20 -0500 |
| commit | e9ccd9b1cb91ef975a11429ec6bc08c1c149c11d (patch) | |
| tree | a5fde78ae6db87fe10d867da545ae48d525963e8 | |
| parent | 64f3141f5fdb26e5d68cc4e3a93390062d50c462 (diff) | |
| download | pfsense-e9ccd9b1cb91ef975a11429ec6bc08c1c149c11d.zip pfsense-e9ccd9b1cb91ef975a11429ec6bc08c1c149c11d.tar.gz | |
More sanity checking
| -rw-r--r-- | etc/inc/vpn.inc | 25 | ||||
| -rwxr-xr-x | usr/local/www/vpn_ipsec_mobile.php | 8 |
2 files changed, 23 insertions, 10 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 47bced9..b01d030 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -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 */ diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php index 281ee5e..34b72d1 100755 --- a/usr/local/www/vpn_ipsec_mobile.php +++ b/usr/local/www/vpn_ipsec_mobile.php @@ -355,7 +355,13 @@ function login_banner_change() { <td width="78%" class="vtable"> <?=gettext("Source"); ?>: <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> |
