further cleanup; fix filter specification for slapd-bind

tests/progs/slapd-bind.c

@@ -398,7 +398,8 @@ novals:;
 		return 1;
 	}
 
-	fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, ndns );
+	fprintf( stderr, "  PID=%ld - Bind base=\"%s\" filter=\"%s\" got %d values.\n",
+		(long) pid, base->bv_val, filter, ndns );
 
 	/* Ok, got list of DNs, now start binding to each */
 	for ( i = 0; i < maxloop; i++ ) {

tests/progs/slapd-read.c

@@ -269,7 +269,8 @@ do_random( char *uri, char *manager, struct berval *passwd,
 		ldap_msgfree( res );
 
 		if ( do_retry == maxretries ) {
-			fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, nvalues );
+			fprintf( stderr, "  PID=%ld - Read base=\"%s\" filter=\"%s\" got %d values.\n",
+				(long) pid, sbase, filter, nvalues );
 		}
 
 		for ( i = 0; i < innerloop; i++ ) {

tests/progs/slapd-search.c

@@ -287,7 +287,8 @@ do_random( char *uri, char *manager, struct berval *passwd,
 		ldap_msgfree( res );
 
 		if ( do_retry == maxretries ) {
-			fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, nvalues );
+			fprintf( stderr, "  PID=%ld - Search base=\"%s\" filter=\"%s\" got %d values.\n",
+				(long) pid, sbase, filter, nvalues );
 		}
 
 		for ( i = 0; i < innerloop; i++ ) {

tests/progs/slapd-tester.c

@@ -676,12 +676,14 @@ main( int argc, char **argv )
 			bargs[banum - 1] = NULL;
 			if ( battrs[jj] != NULL ) {
 				bargs[banum - 5] = "-b";
+				bargs[banum - 3] = "-f";
 				bargs[banum - 1] = "-a";
 				bargs[banum] = battrs[jj];
 			}
 
 			fork_child( bcmd, bargs );
 			bargs[banum - 5] = "-D";
+			bargs[banum - 3] = "-w";
 		}
 	}