WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed search_username when using Samba 2.x and 3 in the same suffix

This commit is contained in:
Roland Gruber 2003-07-06 10:03:21 +00:00
parent 1f00f7cf2f
commit baec410581
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lam/lib/ldap.inc
View File

@ -115,11 +115,11 @@ class Ldap{
function search_username($name) { function search_username($name) {
if ($this->conf->get_samba3() == "yes") { if ($this->conf->get_samba3() == "yes") {
// users have the attribute "posixAccount" or "sambaSamAccount" and uid $name // users have the attribute "posixAccount" or "sambaSamAccount" and uid $name
$filter = "(&(|(objectClass=posixAccount) (objectClass=sambaSamAccount)) (uid=$name))"; $filter = "(&(objectClass=sambaSamAccount) (uid=$name))";
} }
else { else {
// users have the attribute "posixAccount" or "sambaAccount" and uid $name // users have the attribute "posixAccount" or "sambaAccount" and uid $name
$filter = "(&(|(objectClass=posixAccount) (objectClass=sambaAccount)) (uid=$name))"; $filter = "(&(objectClass=sambaAccount) (uid=$name))";
} }
$attrs = array(); $attrs = array();
$sr = @ldap_search($this->server, $this->conf->get_UserSuffix(), $filter, $attrs); $sr = @ldap_search($this->server, $this->conf->get_UserSuffix(), $filter, $attrs);

2
lam/templates/lists/userlink.php
View File

@ -51,7 +51,7 @@ else {
echo "<html><head><title>userlink</title>\n"; echo "<html><head><title>userlink</title>\n";
echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\">\n"; echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\">\n";
echo "</head><body>\n"; echo "</head><body>\n";
echo StatusMessage("ERROR", "", _("This user was not found or is invalid!") . " " . $user); echo StatusMessage("ERROR", "", _("This user was not found!") . " (" . $user . ")");
echo ("</body></html>\n"); echo ("</body></html>\n");
} }