fix handling of bind-timeout

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index f2c2035fb037772c80f989f05489c2baf54f1c11..4a876a67ea94ccef9e09ceb78a212ecdfb075255 100644 (file)
--- 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;
                        }