From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Thu, 19 Mar 2020 18:42:46 +0000 (+0100)
Subject: fixes auto-detecting UUID attributes
X-Git-Tag: v16.0.10RC1~31^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=49eaef63c293271c0c328d41270faee6aa537b92;p=nextcloud-server.git

fixes auto-detecting UUID attributes

the continue (and later the early return) avoided proper looping over the
attribute candidates.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 3ebd053402b..6bef997a42f 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -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']);