diff options
| -rw-r--r-- | etc/inc/auth.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/system_usermanager_settings.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 0171fe6..01ea4d8 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -653,7 +653,7 @@ function ldap_backed($username, $passwd) { $ldapnameattribute = $config['system']['webgui']['ldapnameattribute']; $ldapfilter = $config['system']['webgui']['ldapfilter']; $ldaptype = $config['system']['webgui']['backend']; - $ldapfilter = str_replace("<username>", $username, $ldapfilter); + $ldapfilter = str_replace("_username_", $username, $ldapfilter); /* first check if there is even an LDAP server populated */ if(!$ldapserver) { diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php index 0d8573c..3956830 100755 --- a/usr/local/www/system_usermanager_settings.php +++ b/usr/local/www/system_usermanager_settings.php @@ -194,7 +194,7 @@ include("head.inc"); document.iform.ldapserver.disabled = 0;
document.iform.ldapbindun.disabled = 0;
document.iform.ldapbindpw.disabled = 0;
- document.iform.ldapfilter.value = "(samaccountname=<username>)";
+ document.iform.ldapfilter.value = "(samaccountname=_username_)";
document.iform.ldapnameattribute.value = "samaccountname";
document.iform.ldapgroupattribute.value = "memberOf";
break;
@@ -208,7 +208,7 @@ include("head.inc"); document.iform.ldapserver.disabled = 0;
document.iform.ldapbindun.disabled = 0;
document.iform.ldapbindpw.disabled = 0;
- document.iform.ldapfilter.value = "(cn=<username>)";
+ document.iform.ldapfilter.value = "(cn=_username_)";
document.iform.ldapnameattribute.value = "CN";
document.iform.ldapgroupattribute.value = "groupMembership";
break;
@@ -287,8 +287,8 @@ if(!$pconfig['backend']) </div>
<div id="filteradvdiv" name="filteradvdiv" style="display:none">
<input name="ldapfilter" id="ldapfilter" size="65" value="<?=htmlspecialchars($pconfig['ldapfilter']);?>">
- <br/>Example: For Active Directory you would want to use (samaccountname=<username>)
- <br/>Example: For eDirectory you would want to use (cn=<username>)
+ <br/>Example: For Active Directory you would want to use (samaccountname=_username_)
+ <br/>Example: For eDirectory you would want to use (cn=_username_)
</div>
</td>
</tr>
|
