* [FIX] Fixed LDAP user search filter when ADS is not set. Solves #277

This commit is contained in:
nuxsmin
2016-09-19 14:46:10 +02:00
parent 5b6232c08d
commit c55558544b

View File

@@ -186,7 +186,13 @@ class Ldap
$log = new Log(__FUNCTION__);
$groupDN = (!empty(self::$_ldapGroup)) ? self::searchGroupDN() : '*';
$filter = '(&(|(memberOf=' . $groupDN . ')(groupMembership=' . $groupDN . ')(memberof:1.2.840.113556.1.4.1941:=' . $groupDN . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
if (self::$_ADS === true) {
$filter = '(&(|(memberOf=' . $groupDN . ')(groupMembership=' . $groupDN . ')(memberof:1.2.840.113556.1.4.1941:=' . $groupDN . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
} else {
$filter = '(&(|(memberOf=' . $groupDN . ')(groupMembership=' . $groupDN . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
}
$filterAttr = array('dn');
$searchRes = @ldap_search(self::$_ldapConn, self::$_searchBase, $filter, $filterAttr);