better handling of bind retry

tests/progs/slapd-addel.c

@@ -291,9 +291,17 @@ retry:;
 	rc = ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE );
 	if ( rc != LDAP_SUCCESS ) {
 		ldap_perror( ld, "ldap_bind" );
-		if ( rc == LDAP_BUSY && do_retry > 0 ) {
-			do_retry--;
-			goto retry;
+		switch ( rc ) {
+		case LDAP_BUSY:
+		case LDAP_UNAVAILABLE:
+			if ( do_retry == 1 ) {
+				do_retry = 0;
+				sleep( 1 );
+				goto retry;
+			}
+		/* fallthru */
+		default:
+			break;
 		}
 		exit( EXIT_FAILURE );
 	}

tests/progs/slapd-modify.c

@@ -185,9 +185,17 @@ retry:;
 	rc = ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE );
 	if ( rc != LDAP_SUCCESS ) {
 		ldap_perror( ld, "ldap_bind" );
-		if ( rc == LDAP_BUSY && do_retry > 0 ) {
-			do_retry--;
-			goto retry;
+		switch ( rc ) {
+		case LDAP_BUSY:
+		case LDAP_UNAVAILABLE:
+			if ( do_retry == 1 ) {
+				do_retry = 0;
+				sleep( 1 );
+				goto retry;
+			}
+		/* fallthru */
+		default:
+			break;
 		}
 		exit( EXIT_FAILURE );
 	}

tests/progs/slapd-modrdn.c

@@ -177,9 +177,17 @@ retry:;
 	rc = ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE );
 	if ( rc != LDAP_SUCCESS ) {
 		ldap_perror( ld, "ldap_bind" );
-		if ( rc == LDAP_BUSY && do_retry > 0 ) {
-			do_retry--;
-			goto retry;
+		switch ( rc ) {
+		case LDAP_BUSY:
+		case LDAP_UNAVAILABLE:
+			if ( do_retry == 1 ) {
+				do_retry = 0;
+				sleep( 1 );
+				goto retry;
+			}
+		/* fallthru */
+		default:
+			break;
 		}
 		exit( EXIT_FAILURE );
 	}

tests/progs/slapd-read.c

@@ -140,9 +140,17 @@ retry:;
 	rc = ldap_bind_s( ld, NULL, NULL, LDAP_AUTH_SIMPLE );
 	if ( rc != LDAP_SUCCESS ) {
 		ldap_perror( ld, "ldap_bind" );
-		if ( rc == LDAP_BUSY && do_retry > 0 ) {
-			do_retry--;
-			goto retry;
+		switch ( rc ) {
+		case LDAP_BUSY:
+		case LDAP_UNAVAILABLE:
+			if ( do_retry == 1 ) {
+				do_retry = 0;
+				sleep( 1 );
+				goto retry;
+			}
+		/* fallthru */
+		default:
+			break;
 		}
 		exit( EXIT_FAILURE );
 	}

tests/progs/slapd-search.c

@@ -157,11 +157,19 @@ retry:;
 
 	rc = ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE );
 	if ( rc != LDAP_SUCCESS ) {
-		if ( rc == LDAP_BUSY && do_retry == 1 ) {
-			do_retry = 0;
-			goto retry;
-		}
 		ldap_perror( ld, "ldap_bind" );
+		switch ( rc ) {
+		case LDAP_BUSY:
+		case LDAP_UNAVAILABLE:
+			if ( do_retry == 1 ) {
+				do_retry = 0;
+				sleep( 1 );
+				goto retry;
+			}
+		/* fallthru */
+		default:
+			break;
+		}
 		exit( EXIT_FAILURE );
 	}