From 0e4fae93be5ad5cc637357b5661559d6ac162135 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 10 Jun 2006 15:20:55 +0000 Subject: [PATCH] further cleanup; fix filter specification for slapd-bind --- tests/progs/slapd-bind.c | 3 ++- tests/progs/slapd-read.c | 3 ++- tests/progs/slapd-search.c | 3 ++- tests/progs/slapd-tester.c | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c index 7f4b601da7..ac7714cb37 100644 --- 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 36abbc7967..41b2688d4c 100644 --- 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 767a4623c9..945f8c9f2f 100644 --- 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 cfb84a70a8..20d01b15a7 100644 --- 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"; } } -- 2.39.5