From cb7575d2449e84ef05e88e9b097f082cd4e8bcc9 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 10 Feb 2009 11:46:47 +0000 Subject: [PATCH] ITS#5893 less verbose on expected errors, exit on ServerDown --- tests/progs/slapd-bind.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c index 0f73fd6ca4..8ccf0259f5 100644 --- a/tests/progs/slapd-bind.c +++ b/tests/progs/slapd-bind.c @@ -249,13 +249,17 @@ main( int argc, char **argv ) uri = tester_uri( uri, host, port ); for ( i = 0; i < outerloops; i++ ) { + int rc; + if ( base != NULL ) { - do_base( uri, dn, &pass, base, filter, pwattr, loops, + rc = do_base( uri, dn, &pass, base, filter, pwattr, loops, force, chaserefs, noinit, delay, -1, NULL ); } else { - do_bind( uri, dn, &pass, loops, + rc = do_bind( uri, dn, &pass, loops, force, chaserefs, noinit, NULL, -1, NULL ); } + if ( rc == LDAP_SERVER_DOWN ) + break; } exit( EXIT_SUCCESS ); @@ -344,7 +348,7 @@ do_bind( char *uri, char *dn, struct berval *pass, int maxloop, /* if ignore.. */ if ( first ) { /* only log if first occurrence */ - if ( force < 2 || first == 1 ) { + if ( first == 1 ) { tester_ldap_error( ld, "ldap_sasl_bind_s", NULL ); } rc = LDAP_SUCCESS; -- 2.39.5