diff options
author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-25 14:55:20 +0200 |
---|---|---|
committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-25 14:55:20 +0200 |
commit | 632159613447796b5bb7dbe3a17c194573b18b4a (patch) | |
tree | f81507c7344452b33054e0d9468398615ba169c3 /apps/user_ldap/lib/connection.php | |
parent | 9e40b647f3c633f777c8dbe8af70f21343f2a5d5 (diff) | |
parent | 62a59854f0478130c23bc7b8bbf4064b38bbeaf8 (diff) | |
download | nextcloud-server-632159613447796b5bb7dbe3a17c194573b18b4a.tar.gz nextcloud-server-632159613447796b5bb7dbe3a17c194573b18b4a.zip |
Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions
Fix LDAP race conditions
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
-rw-r--r-- | apps/user_ldap/lib/connection.php | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 8b55e2598f4..93e7e4bf974 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -207,10 +207,6 @@ class Connection extends LDAPUtility { if(is_null($this->cache) || !$this->configuration->ldapCacheTTL) { return null; } - if(!$this->isCached($key)) { - return null; - - } $key = $this->getCacheKey($key); return json_decode(base64_decode($this->cache->get($key)), true); @@ -218,21 +214,6 @@ class Connection extends LDAPUtility { /** * @param string $key - * @return bool - */ - public function isCached($key) { - if(!$this->configured) { - $this->readConfiguration(); - } - if(is_null($this->cache) || !$this->configuration->ldapCacheTTL) { - return false; - } - $key = $this->getCacheKey($key); - return $this->cache->hasKey($key); - } - - /** - * @param string $key * @param mixed $value * * @return string |