ITS#6003, #5916 fix ldap_back_entry_get_rw, no deref here

[openldap] / tests / progs / slapd-read.c

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index 458dbd3565c61aa07657f6b4a9df3541166e189d..35dcbe6f3aa9650001259e4cf9b7c5283e50ffd9 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2008 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -319,7 +319,7 @@ do_random( char *uri, char *manager, struct berval *passwd,
                break;
        }
 
-       fprintf( stderr, " PID=%ld - Search done (%d).\n", (long) pid, rc );
+       fprintf( stderr, "  PID=%ld - Search done (%d).\n", (long) pid, rc );
 
        if ( ld != NULL ) {
                ldap_unbind_ext( ld, NULL, NULL );
@@ -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 );
@@ -397,7 +397,7 @@ retry:;
                        /* if ignore.. */
                        if ( first ) {
                                /* only log if first occurrence */
-                               if ( force < 2 || first == 1 ) {
+                               if ( ( force < 2 && first > 0 ) || abs(first) == 1 ) {
                                        tester_ldap_error( ld, buf, NULL );
                                }
                                continue;
@@ -419,7 +419,7 @@ retry:;
                *ldp = ld;
 
        } else {
-               fprintf( stderr, " PID=%ld - Read done (%d).\n", (long) pid, rc );
+               fprintf( stderr, "  PID=%ld - Read done (%d).\n", (long) pid, rc );
 
                if ( ld != NULL ) {
                        ldap_unbind_ext( ld, NULL, NULL );