Merge pull request #8221 from Cybso/8220_applyLdapUserFilter_on_members

Apply ldapUserFilter on members of group
nextcloud · Mar 8, 2018 · cccf6f4 · cccf6f4
2 parents a2db959 + 2472b93
commit cccf6f4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
@@ -537,9 +537,11 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
 		if($isUser) {
 			$mapper = $this->getUserMapper();
 			$nameAttribute = $this->connection->ldapUserDisplayName;
+			$filter = $this->connection->ldapUserFilter;
 		} else {
 			$mapper = $this->getGroupMapper();
 			$nameAttribute = $this->connection->ldapGroupDisplayName;
+			$filter = $this->connection->ldapGroupFilter;
 		}
 
 		//let's try to retrieve the Nextcloud name from the mappings table
@@ -563,9 +565,9 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
 		}
 
 		if(is_null($ldapName)) {
-			$ldapName = $this->readAttribute($fdn, $nameAttribute);
+			$ldapName = $this->readAttribute($fdn, $nameAttribute, $filter);
 			if(!isset($ldapName[0]) && empty($ldapName[0])) {
-				\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$fdn.'.', \OCP\Util::INFO);
+				\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$fdn.' with filter '.$filter.'.', \OCP\Util::INFO);
 				return false;
 			}
 			$ldapName = $ldapName[0];