further cleanup; fix filter specification for slapd-bind

diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index 7f4b601da7d9effa0970c2d9597b2de8929d0595..ac7714cb374a281e818c0c825cfce8b6606ef3ca 100644 (file)
--- a/tests/progs/slapd-bind.c
+++ b/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++ ) {

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index 36abbc79677ebb253b474b3cd43d8b803b946062..41b2688d4cbfbf660c263cd9f0894eda5f358a6f 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/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++ ) {

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 767a4623c98306fd7a74658833c86103a6cca2ca..945f8c9f2f55bf9bcb8a436c30ae8aa3b1bb2ce4 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/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++ ) {

diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index cfb84a70a844e2455e780f978cf55465bdb46b8c..20d01b15a7c849116bf77a80779e5412f714a0e3 100644 (file)
--- a/tests/progs/slapd-tester.c
+++ b/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";
                }
        }