diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2007-12-31 03:24:38 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2007-12-31 03:24:38 +0000 |
commit | f3f60e61d65e094020b31774f5b89b49c501c514 (patch) | |
tree | fbd8e9f024fac75ba96ef50bafdfca25633f151b | |
parent | 8e85eff777b2f3690ab7181ac1263db3ecd8b732 (diff) | |
download | pfsense-f3f60e61d65e094020b31774f5b89b49c501c514.zip pfsense-f3f60e61d65e094020b31774f5b89b49c501c514.tar.gz |
* Return OU=Users which is built-in to active directory
* Specify that LDAP is Active Directory compatible
Work sponsored-by: Centipede Networks
-rw-r--r-- | etc/inc/auth.inc | 2 | ||||
-rwxr-xr-x | usr/local/www/system_usermanager_settings.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 45e0210..0af5ae6 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -687,6 +687,8 @@ function ldap_get_user_ous($show_complete_ou=false) { $ous[] = $ou; } + $ous[] = "OU=Users," . $ldapsearchbase; + return $ous; } diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php index a4f7a8e..8ebfad5 100755 --- a/usr/local/www/system_usermanager_settings.php +++ b/usr/local/www/system_usermanager_settings.php @@ -169,7 +169,7 @@ if(!$pconfig['backend']) <td width="78%" class="vtable"> <select name='backend'> <option value="pfsense"<?php if ($pconfig['backend'] == "pfsense") echo " SELECTED";?>>pfSense</option> - <option value="ldap"<?php if ($pconfig['backend'] == "ldap") echo " SELECTED";?>>LDAP</option> + <option value="ldap"<?php if ($pconfig['backend'] == "ldap") echo " SELECTED";?>>LDAP (Active Directory)</option> </select> <br/>NOTE: login failures or server not available issues will fall back to pfSense internal users/group authentication. </td> |