mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20048 from nextcloud/backport/20039/stable16 

[stable16] fixes auto-detecting UUID attributes
This commit is contained in:
Roeland Jago Douma 2020-03-22 14:23:44 +01:00 committed by GitHub
parent a4a1214231 49eaef63c2
commit 25b78ac569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/user_ldap/lib/Access.php
View File

@ -1698,7 +1698,6 @@ class Access extends LDAPUtility {
$this->connection->$uuidAttr = $attribute; $this->connection->$uuidAttr = $attribute;
return true; return true;
} }
continue;
} }
$value = $this->readAttribute($dn, $attribute); $value = $this->readAttribute($dn, $attribute);
@ -1714,9 +1713,6 @@ class Access extends LDAPUtility {
$this->connection->$uuidAttr = $attribute; $this->connection->$uuidAttr = $attribute;
$this->connection->writeToCache($uuidAttr, $attribute); $this->connection->writeToCache($uuidAttr, $attribute);
return true; return true;
} elseif ($value === false) {
// record not available
return false;
} }
} }
\OC::$server->getLogger()->debug('Could not autodetect the UUID attribute', ['app' => 'user_ldap']); \OC::$server->getLogger()->debug('Could not autodetect the UUID attribute', ['app' => 'user_ldap']);