From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 21 Dec 2005 17:28:27 +0000 (+0000)
Subject: fix handling of bind-timeout
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~528
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d4418b044a21b48f598829cd0187a04ed3a2033;p=openldap

fix handling of bind-timeout
---

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index f2c2035fb0..4a876a67ea 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -342,7 +342,6 @@ rebind:;
 		 * handle response!!!
 		 */
 retry:;
-		tv = mt->mt_bind_timeout;
 		switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
 		case 0:
 			snprintf( buf, sizeof( buf ),
@@ -357,7 +356,7 @@ retry:;
 				if ( nretries > 0 ) {
 					nretries--;
 				}
-				LDAP_BACK_TV_SET( &tv );
+				tv = mt->mt_bind_timeout;
 				goto retry;
 			}
 			rs->sr_err = LDAP_BUSY;
@@ -498,7 +497,6 @@ rebind:;
 		 * handle response!!!
 		 */
 retry:;
-		tv = mt->mt_bind_timeout;
 		switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
 		case 0:
 			snprintf( buf, sizeof( buf ),
@@ -513,7 +511,7 @@ retry:;
 				if ( nretries > 0 ) {
 					nretries--;
 				}
-				LDAP_BACK_TV_SET( &tv );
+				tv = mt->mt_bind_timeout;
 				goto retry;
 			}