From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 3 Apr 2006 00:34:35 +0000 (+0000)
Subject: fix ITS#4450?
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8823f5cc87e4a2b7c4c002f8dbb187cfacdbfb9b;p=openldap

fix ITS#4450?
---

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index a3849da871..57f6ea9ab3 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -897,26 +897,21 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
 			LDAPRequest *lp;
 			int looped = 0;
 			int len = srv->lud_dn ? strlen( srv->lud_dn ) : 0;
-			for (lp = origreq; lp; ) {
+			for ( lp = origreq; lp; ) {
 				if ( lp->lr_conn == lc ) {
-					if ( len == lp->lr_dn.bv_len ) {
-						if ( len && strncmp( srv->lud_dn, lp->lr_dn.bv_val,
-							len ))
-						{
-							/* FIXME: if different DNs are requested
-							 * for the same connection, this causes
-							 * an endless loop, because lp is never
-							 * changed */
-							continue;
-						}
+					if ( len == lp->lr_dn.bv_len
+						&& len
+						&& strncmp( srv->lud_dn, lp->lr_dn.bv_val, len ) == 0 )
+					{
 						looped = 1;
 						break;
 					}
 				}
-				if ( lp == origreq )
+				if ( lp == origreq ) {
 					lp = lp->lr_child;
-				else
+				} else {
 					lp = lr->lr_refnext;
+				}
 			}
 			if ( looped ) {
 				ldap_free_urllist( srv );
@@ -926,7 +921,7 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
 				continue;
 			}
 
-			if( lc->lconn_rebind_inprogress) {
+			if ( lc->lconn_rebind_inprogress ) {
 				/* We are already chasing a referral or search reference and a
 				 * bind on that connection is in progress.  We must queue
 				 * referrals on that connection, so we don't get a request