fix previous (obviously broken) commit

diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index 8a48edae797f252bb34c254f84121d78f4ec3627..1b597f27f04b1063528a535992e2ee259bb15943 100644 (file)
--- a/tests/progs/slapd-bind.c
+++ b/tests/progs/slapd-bind.c
@@ -343,7 +343,7 @@ do_bind( char *uri, char *dn, struct berval *pass, int maxloop,
 
                rc = ldap_sasl_bind_s( ld, dn, LDAP_SASL_SIMPLE, pass, NULL, NULL, NULL );
                if ( rc ) {
-                       unsigned first = tester_ignore_err( rc );
+                       int first = tester_ignore_err( rc );
 
                        /* if ignore.. */
                        if ( first ) {

diff --git a/tests/progs/slapd-common.c b/tests/progs/slapd-common.c
index c7c18c1a48898602dad3806508379c5b35c7da9e..06e1060efbd68a1faa3cee32f68e5c3c61c5581a 100644 (file)
--- a/tests/progs/slapd-common.c
+++ b/tests/progs/slapd-common.c
@@ -40,8 +40,8 @@ tester_t progtype;
 
 #define        TESTER_SERVER_LAST      (LDAP_OTHER + 1)
 #define TESTER_CLIENT_LAST     (- LDAP_REFERRAL_LIMIT_EXCEEDED + 1)
-static unsigned ignore_server[ TESTER_SERVER_LAST ];
-static unsigned ignore_client[ TESTER_CLIENT_LAST ];
+static int ignore_server[ TESTER_SERVER_LAST ];
+static int ignore_client[ TESTER_CLIENT_LAST ];
 
 static struct {
        char    *name;
@@ -126,8 +126,7 @@ static struct {
 static int
 tester_ignore_str2err( const char *err )
 {
-       int             i;
-       unsigned        ignore = 1;
+       int             i, ignore = 1;
 
        if ( strcmp( err, "ALL" ) == 0 ) {
                for ( i = 0; ignore_str2err[ i ].name != NULL; i++ ) {
@@ -187,10 +186,10 @@ tester_ignore_str2errlist( const char *err )
        return 0;
 }
 
-unsigned
+int
 tester_ignore_err( int err )
 {
-       unsigned        rc = 1;
+       int rc = 1;
 
        if ( err > 0 ) {
                if ( err < TESTER_SERVER_LAST ) {

diff --git a/tests/progs/slapd-common.h b/tests/progs/slapd-common.h
index 36002d7110088fb62afed1a2f3f07096db2a3b1e..454f2488135b3b98ca22aa82f7b26ff02d1d0194 100644 (file)
--- a/tests/progs/slapd-common.h
+++ b/tests/progs/slapd-common.h
@@ -37,7 +37,7 @@ extern void tester_error( const char *msg );
 extern void tester_perror( const char *fname, const char *msg );
 extern void tester_ldap_error( LDAP *ld, const char *fname, const char *msg );
 extern int tester_ignore_str2errlist( const char *err );
-extern unsigned tester_ignore_err( int err );
+extern int tester_ignore_err( int err );
 
 extern pid_t           pid;
 

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index e3617065f7af4125296a659a649f84794536a4fb..35dcbe6f3aa9650001259e4cf9b7c5283e50ffd9 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -389,7 +389,7 @@ retry:;
                }
 
                if ( rc ) {
-                       unsigned        first = tester_ignore_err( rc );
+                       int             first = tester_ignore_err( rc );
                        char            buf[ BUFSIZ ];
 
                        snprintf( buf, sizeof( buf ), "ldap_search_ext_s(%s)", entry );

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index af824164051a2a1ba111a11f71e4914397b1d5c1..6b15ab4ecc2c894775b29e8b73d170c8fb00e122 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -443,7 +443,7 @@ retry:;
                }
 
                if ( rc ) {
-                       unsigned first = tester_ignore_err( rc );
+                       int first = tester_ignore_err( rc );
                        /* if ignore.. */
                        if ( first ) {
                                /* only log if first occurrence */