From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 21 Feb 2007 22:26:26 +0000 (+0000)
Subject: don't play with URL list if connect(2) is asynchronous
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~653
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=687ed8861a503e3adadd3502d99e39302a697b10;p=openldap

don't play with URL list if connect(2) is asynchronous
---

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index ee0ec5013b..f139e647eb 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -377,11 +377,13 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
 		async = LDAP_BOOL_GET( &ld->ld_options, LDAP_BOOL_CONNECT_ASYNC );
 
 		for ( srvp = srvlist; *srvp != NULL; srvp = &(*srvp)->lud_next ) {
-			if ( ldap_int_open_connection( ld, lc, *srvp, async) != -1 )
-			{
+			int		rc;
+
+			rc = ldap_int_open_connection( ld, lc, *srvp, async );
+			if ( rc != -1 ) {
 				srv = *srvp;
 
-				if ( ld->ld_urllist_proc ) {
+				if ( ld->ld_urllist_proc && ( !async || rc != -2 ) ) {
 					ld->ld_urllist_proc( ld, srvlist, srvp, ld->ld_urllist_params );
 				}