diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2007-12-28 00:46:26 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2007-12-28 00:46:26 +0000 |
commit | 9d265058e7693c830f80be173ab09d3ee850ec00 (patch) | |
tree | 3552b4d04fccff8a632068337229023f1f124c64 | |
parent | 48e2304370eb988514013acae1bad0b483371c76 (diff) | |
download | pfsense-9d265058e7693c830f80be173ab09d3ee850ec00.zip pfsense-9d265058e7693c830f80be173ab09d3ee850ec00.tar.gz |
* Hide search base
* Use correct variable name
Work sponsored-by: Centipede Networks
-rw-r--r-- | etc/inc/auth.inc | 2 | ||||
-rwxr-xr-x | usr/local/www/system_usermanager_settings.php | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 9f3dcb5..0245a1c 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -587,7 +587,7 @@ function ldap_backed($username, $passwd) { return $status; } - if (!($res = @ldap_bind($ldap, $ldapsearchbase, $passwd))) { + if (!($res = @ldap_bind($ldap, $username, $passwd))) { log_error("ERROR! LDAP could not bind to {$ldapserver} - {$dn}. Defaulting to built-in htpasswd_backed()"); $status = htpasswd_backed($username, $passwd); return $status; diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php index e5087ec..76ef0d1 100755 --- a/usr/local/www/system_usermanager_settings.php +++ b/usr/local/www/system_usermanager_settings.php @@ -35,7 +35,7 @@ $pconfig['backend'] = &$config['system']['webgui']['backend']; $pconfig['ldapbindun'] = &$config['system']['webgui']['ldapbindun']; $pconfig['ldapbindpw'] = &$config['system']['webgui']['ldapbindpw']; -$pconfig['ldapfilter'] = &$config['system']['webgui']['ldapfilter']; +//$pconfig['ldapfilter'] = &$config['system']['webgui']['ldapfilter']; $pconfig['ldapsearchbase'] = &$config['system']['webgui']['ldapsearchbase']; // Page title for main admin @@ -94,10 +94,12 @@ if ($_POST) { else unset($pconfig['ldapbindpw']); +/* if($_POST['ldapfilter']) $pconfig['ldapfilter'] = $_POST['ldapfilter']; else unset($pconfig['ldapfilter']); +*/ if($_POST['ldapsearchbase']) $pconfig['ldapsearchbase'] = $_POST['ldapsearchbase']; @@ -150,11 +152,11 @@ if(!$pconfig['backend']) </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Authentication backend</td> + <td width="22%" valign="top" class="vncell">Authentication primary backend</td> <td width="78%" class="vtable"> <select name='backend'> - <option value="pfsense"<?php if ($pconfig['backend'] == "pfsense") echo " SELECTED";?>>Built in</option> - <option value="ldap"<?php if ($pconfig['backend'] == "ldap") echo " SELECTED";?>>LDAP, Built in</option> + <option value="pfsense"<?php if ($pconfig['backend'] == "pfsense") echo " SELECTED";?>>pfSense</option> + <option value="ldap"<?php if ($pconfig['backend'] == "ldap") echo " SELECTED";?>>LDAP</option> </select> </td> </tr> @@ -177,12 +179,16 @@ if(!$pconfig['backend']) <input name="ldapbindpw" size="65" value="<?=htmlspecialchars($pconfig['ldapbindpw']);?>"> </td> </tr> +<?php +/* <tr> <td width="22%" valign="top" class="vncell">LDAP Filter</td> <td width="78%" class="vtable"> <input name="ldapfilter" size="65" value="<?=htmlspecialchars($pconfig['ldapfilter']);?>"> </td> </tr> +*/ +?> <tr> <td width="22%" valign="top" class="vncell">LDAP Search base</td> <td width="78%" class="vtable"> |