From 1ed61328991ce1071fc956a18ea3159405b0e6f3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 27 Nov 2015 23:46:26 +0100 Subject: LDAP: do not attempt to process user records without display name, fixes fatal error --- apps/user_ldap/lib/access.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'apps/user_ldap/lib') diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 7d2d355f9b4..b1e3a4c0443 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -706,8 +706,16 @@ class Access extends LDAPUtility implements user\IUserTools { * @param array $ldapRecords */ public function batchApplyUserAttributes(array $ldapRecords){ + $displayNameAttribute = strtolower($this->connection->ldapUserDisplayName); foreach($ldapRecords as $userRecord) { + if(!isset($userRecord[$displayNameAttribute])) { + // displayName is obligatory + continue; + } $ocName = $this->dn2ocname($userRecord['dn'][0]); + if($ocName === false) { + continue; + } $this->cacheUserExists($ocName); $user = $this->userManager->get($ocName); if($user instanceof OfflineUser) { -- cgit v1.2.3