fix handling of bind-timeout

CHANGES

@@ -17,8 +17,9 @@ OpenLDAP 2.3.14 Engineering
 	Fixed slapd-bdb/hdb cn=config reindexing (ITS#4260)
 	Fixed slapd-bdb/hdb cn=config olcDbIndex modify/replace (ITS#4262)
 	Fixed slapd-bdb/hdb lockup issue (ITS#4184)
-	Added slapd-ldap/meta idle-timeout support (ITS#4115)
 	Fixed slapd-ldap anonymous identity assertion (ITS#4272)
+	Added slapd-ldap/meta idle-timeout support (ITS#4115)
+	Fixed slapd-meta bind-timeout handling (ITS#xxxx)
 	Fixed slapo-rwm static DN free bug (ITS#4248)
 	Fixed slapo-syncprov unpublished control (ITS#4238)
 	Fixed slapo-syncprov message id issue

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;
 			}
 

tests/data/slapd-meta.conf

@@ -35,6 +35,10 @@ argsfile	@TESTDIR@/slapd.m.args
 #rwmmod#modulepath ../servers/slapd/overlays/
 #rwmmod#moduleload rwm.la
 
+# seems to improve behavior under very heavy load
+# (i.e. it alleviates load on target systems)
+threads		8
+
 #######################################################################
 # database definitions
 #######################################################################
@@ -59,4 +63,6 @@ suffixmassage	"o=Example,c=US" "dc=example,dc=com"
 pseudorootdn	"cn=manager,dc=example,dc=com"
 pseudorootpw	secret
 
+limits		dn.exact="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Example,c=US" time=1 size=8
+
 #monitor#database	monitor