Port PR #5457 to master

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 97e44fdcb211b12e3af5eaec77993cdbd83bc4e6..f133260383cba4ba8b4c052077bee1512d9e4a4b 100644 (file)
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -28,6 +28,8 @@ class Access extends LDAPUtility {
        //never ever check this var directly, always use getPagedSearchResultState
        protected $pagedSearchedSuccessful;
 
+       protected $cookies = array();
+
        public function __construct(Connection $connection, ILDAPWrapper $ldap) {
                parent::__construct($ldap);
                $this->connection = $connection;
@@ -60,6 +62,8 @@ class Access extends LDAPUtility {
                        \OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG);
                        return false;
                }
+               //all or nothing! otherwise we get in trouble with.
+               $this->initPagedSearch($filter, array($dn), $attr, 99999, 0);
                $dn = $this->DNasBaseParameter($dn);
                $rr = @$this->ldap->read($cr, $dn, $filter, array($attr));
                if(!$this->ldap->isResource($rr)) {
@@ -1048,9 +1052,12 @@ class Access extends LDAPUtility {
                $offset -= $limit;
                //we work with cache here
                $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . $limit . '-' . $offset;
-               $cookie = $this->connection->getFromCache($cachekey);
-               if(is_null($cookie)) {
-                       $cookie = '';
+               $cookie = '';
+               if(isset($this->cookies[$cachekey])) {
+                       $cookie = $this->cookies[$cachekey];
+                       if(is_null($cookie)) {
+                               $cookie = '';
+                       }
                }
                return $cookie;
        }
@@ -1067,7 +1074,7 @@ class Access extends LDAPUtility {
        private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
                if(!empty($cookie)) {
                        $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .$limit . '-' . $offset;
-                       $cookie = $this->connection->writeToCache($cachekey, $cookie);
+                       $this->cookies[$cachekey] = $cookie;
                }
        }