mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
ITS#5893 less verbose on expected errors, exit on ServerDown
This commit is contained in:
parent
6a838df274
commit
cb7575d244
1 changed files with 7 additions and 3 deletions
|
|
@ -249,13 +249,17 @@ main( int argc, char **argv )
|
||||||
uri = tester_uri( uri, host, port );
|
uri = tester_uri( uri, host, port );
|
||||||
|
|
||||||
for ( i = 0; i < outerloops; i++ ) {
|
for ( i = 0; i < outerloops; i++ ) {
|
||||||
|
int rc;
|
||||||
|
|
||||||
if ( base != NULL ) {
|
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 );
|
force, chaserefs, noinit, delay, -1, NULL );
|
||||||
} else {
|
} else {
|
||||||
do_bind( uri, dn, &pass, loops,
|
rc = do_bind( uri, dn, &pass, loops,
|
||||||
force, chaserefs, noinit, NULL, -1, NULL );
|
force, chaserefs, noinit, NULL, -1, NULL );
|
||||||
}
|
}
|
||||||
|
if ( rc == LDAP_SERVER_DOWN )
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
exit( EXIT_SUCCESS );
|
exit( EXIT_SUCCESS );
|
||||||
|
|
@ -344,7 +348,7 @@ do_bind( char *uri, char *dn, struct berval *pass, int maxloop,
|
||||||
/* if ignore.. */
|
/* if ignore.. */
|
||||||
if ( first ) {
|
if ( first ) {
|
||||||
/* only log if first occurrence */
|
/* only log if first occurrence */
|
||||||
if ( force < 2 || first == 1 ) {
|
if ( first == 1 ) {
|
||||||
tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
|
tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
|
||||||
}
|
}
|
||||||
rc = LDAP_SUCCESS;
|
rc = LDAP_SUCCESS;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue