From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 31 Aug 2004 02:08:28 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_16~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f28f15da41e65a1cfcb02db3ea9510d50b9a4d7e;p=openldap

Sync with HEAD
---

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index dbf75ee140..03356c5cef 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -314,6 +314,7 @@ wait4msg(
         if( (*result = chkResponseList(ld, msgid, all)) != NULL ) {
             rc = (*result)->lm_msgtype;
         } else {
+			int lc_ready = 0;
 
 			for ( lc = ld->ld_conns; lc != NULL; lc = nextlc ) {
 				nextlc = lc->lconn_next;
@@ -321,11 +322,12 @@ wait4msg(
 						LBER_SB_OPT_DATA_READY, NULL ) ) {
 					rc = try_read1msg( ld, msgid, all, lc->lconn_sb,
 						&lc, result );
+					lc_ready = 1;
 				    break;
 				}
 	        }
 
-		    if ( lc == NULL ) {
+		    if ( !lc_ready ) {
 			    rc = ldap_int_select( ld, tvp );
 #ifdef LDAP_DEBUG
 			    if ( rc == -1 ) {