diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2014-03-20 22:59:41 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-03-20 22:59:41 +0100 |
| commit | a085d7715f7fda43f322eb36143b268add3f2061 (patch) | |
| tree | df88d0723a3a14677b1a40859686b922c95a84cd /apps/user_ldap/lib | |
| parent | 561d699ca67c0f5d3130b80e238c7ace8ba57e42 (diff) | |
| download | nextcloud-server-a085d7715f7fda43f322eb36143b268add3f2061.tar.gz nextcloud-server-a085d7715f7fda43f322eb36143b268add3f2061.zip | |
fix potential infinite loop when the DN of the first entry was already read.
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/wizard.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index f97ab51f0f0..f6bc586a7a6 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -910,6 +910,7 @@ class Wizard extends LDAPUtility { $dnReadCount = 0; do { $entry = $this->ldap->$getEntryFunc($cr, $rr); + $getEntryFunc = 'nextEntry'; if(!$this->ldap->isResource($entry)) { continue 2; } @@ -926,7 +927,6 @@ class Wizard extends LDAPUtility { $foundItems = array_merge($foundItems, $newItems); $this->resultCache[$dn][$attr] = $newItems; $dnRead[] = $dn; - $getEntryFunc = 'nextEntry'; $rr = $entry; //will be expected by nextEntry next round } while(($state === self::LRESULT_PROCESSED_SKIP || $this->ldap->isResource($entry)) |