Merge pull request #37304 from nextcloud/backport/37006/stable26

blizzz · web-flow · commit 0c3439e1512c · 2023-05-17T13:36:46.000+02:00
[stable26] also unmark deleted ldap user when checking the ldap entry
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
@@ -335,8 +335,6 @@ public function userExistsOnLDAP($user, bool $ignoreCache = false): bool {
 					return false;
 				}
 				$this->access->getUserMapper()->setDNbyUUID($newDn, $uuid);
-				$this->access->connection->writeToCache($cacheKey, true);
-				return true;
 			} catch (ServerNotAvailableException $e) {
 				throw $e;
 			} catch (\Exception $e) {

Original file line number	Diff line number	Diff line change
`@@ -335,8 +335,6 @@ public function userExistsOnLDAP($user, bool $ignoreCache = false): bool {`
`335`	`335`	`return false;`
`336`	`336`	`}`
`337`	`337`	`$this->access->getUserMapper()->setDNbyUUID($newDn, $uuid);`
`338`		`- $this->access->connection->writeToCache($cacheKey, true);`
`339`		`- return true;`
`340`	`338`	`} catch (ServerNotAvailableException $e) {`
`341`	`339`	`throw $e;`
`342`	`340`	`} catch (\Exception $e) {`