]> source.dussan.org Git - nextcloud-server.git/commitdiff
fixes auto-detecting UUID attributes 20048/head
authorArthur Schiwon <blizzz@arthur-schiwon.de>
Thu, 19 Mar 2020 18:42:46 +0000 (19:42 +0100)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Fri, 20 Mar 2020 10:10:23 +0000 (10:10 +0000)
the continue (and later the early return) avoided proper looping over the
attribute candidates.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
apps/user_ldap/lib/Access.php

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