From 9f405339d6edbcc17b94f17a60d71b47900fb7cc Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 16 May 2014 18:03:15 +0200 Subject: [PATCH] set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise will always get the same value and we end up in an infinite loop --- apps/user_ldap/lib/wizard.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 5d029a1f00a..8f827d7f383 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -909,6 +909,7 @@ class Wizard extends LDAPUtility { if(!$this->ldap->isResource($entry)) { continue 2; } + $rr = $entry; //will be expected by nextEntry next round $attributes = $this->ldap->getAttributes($cr, $entry); $dn = $this->ldap->getDN($cr, $entry); if($dn === false || in_array($dn, $dnRead)) { @@ -922,7 +923,6 @@ class Wizard extends LDAPUtility { $foundItems = array_merge($foundItems, $newItems); $this->resultCache[$dn][$attr] = $newItems; $dnRead[] = $dn; - $rr = $entry; //will be expected by nextEntry next round } while(($state === self::LRESULT_PROCESSED_SKIP || $this->ldap->isResource($entry)) && ($dnReadLimit === 0 || $dnReadCount < $dnReadLimit)); @@ -1088,4 +1088,4 @@ class Wizard extends LDAPUtility { } -} \ No newline at end of file +}