]> git.sur5r.net Git - openldap/blobdiff - tests/progs/slapd-read.c
ITS#6003, #5916 fix ldap_back_entry_get_rw, no deref here
[openldap] / tests / progs / slapd-read.c
index dc67d5ad773b406396ab2c8ddbeaeb88e32febce..35dcbe6f3aa9650001259e4cf9b7c5283e50ffd9 100644 (file)
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 
 #include <stdio.h>
 
-#include <ac/stdlib.h>
+#include "ac/stdlib.h"
 
-#include <ac/ctype.h>
-#include <ac/param.h>
-#include <ac/socket.h>
-#include <ac/string.h>
-#include <ac/unistd.h>
-#include <ac/wait.h>
+#include "ac/ctype.h"
+#include "ac/param.h"
+#include "ac/socket.h"
+#include "ac/string.h"
+#include "ac/unistd.h"
+#include "ac/wait.h"
 
-#include <ldap.h>
-#include <lutil.h>
+#include "ldap.h"
+#include "lutil.h"
+
+#include "ldap_pvt.h"
 
 #include "slapd-common.h"
 
 
 static void
 do_read( char *uri, char *manager, struct berval *passwd,
-       char *entry, LDAP **ld, int noattrs, int maxloop,
+       char *entry, LDAP **ld,
+       char **attrs, int noattrs, int nobind, int maxloop,
        int maxretries, int delay, int force, int chaserefs );
 
 static void
 do_random( char *uri, char *manager, struct berval *passwd,
-       char *sbase, char *filter, int noattrs,
+       char *sbase, char *filter, char **attrs, int noattrs, int nobind,
        int innerloop, int maxretries, int delay, int force, int chaserefs );
 
 static void
@@ -60,11 +63,16 @@ usage( char *name )
                "[-A] "
                "[-C] "
                "[-F] "
+               "[-N] "
                "[-f filter] "
+               "[-i <ignore>] "
                "[-l <loops>] "
                "[-L <outerloops>] "
                "[-r <maxretries>] "
-               "[-t <delay>]\n",
+               "[-t <delay>] "
+               "[-T <attrs>] "
+               "[<attrs>] "
+               "\n",
                name );
        exit( EXIT_FAILURE );
 }
@@ -86,12 +94,18 @@ main( int argc, char **argv )
        int             delay = 0;
        int             force = 0;
        int             chaserefs = 0;
+       char            *srchattrs[] = { "1.1", NULL };
+       char            **attrs = srchattrs;
        int             noattrs = 0;
+       int             nobind = 0;
+
+       tester_init( "slapd-read", TESTER_READ );
 
-       tester_init( "slapd-read" );
+       /* by default, tolerate referrals and no such object */
+       tester_ignore_str2errlist( "REFERRAL,NO_SUCH_OBJECT" );
 
-       while ( (i = getopt( argc, argv, "ACD:H:h:p:e:Ff:l:L:r:t:w:" )) != EOF ) {
-               switch( i ) {
+       while ( (i = getopt( argc, argv, "ACD:e:Ff:H:h:i:L:l:p:r:t:T:w:" )) != EOF ) {
+               switch ( i ) {
                case 'A':
                        noattrs++;
                        break;
@@ -108,6 +122,14 @@ main( int argc, char **argv )
                        host = strdup( optarg );
                        break;
 
+               case 'i':
+                       tester_ignore_str2errlist( optarg );
+                       break;
+
+               case 'N':
+                       nobind++;
+                       break;
+
                case 'p':               /* the servers port */
                        if ( lutil_atoi( &port, optarg ) != 0 ) {
                                usage( argv[0] );
@@ -121,6 +143,7 @@ main( int argc, char **argv )
                case 'w':               /* the server managers password */
                        passwd.bv_val = strdup( optarg );
                        passwd.bv_len = strlen( optarg );
+                       memset( optarg, '*', passwd.bv_len );
                        break;
 
                case 'e':               /* DN to search for */
@@ -159,6 +182,13 @@ main( int argc, char **argv )
                        }
                        break;
 
+               case 'T':
+                       attrs = ldap_str2charray( optarg, "," );
+                       if ( attrs == NULL ) {
+                               usage( argv[0] );
+                       }
+                       break;
+
                default:
                        usage( argv[0] );
                        break;
@@ -174,17 +204,22 @@ main( int argc, char **argv )
                exit( EXIT_FAILURE );
        }
 
+       if ( argv[optind] != NULL ) {
+               attrs = &argv[optind];
+       }
+
        uri = tester_uri( uri, host, port );
 
        for ( i = 0; i < outerloops; i++ ) {
                if ( filter != NULL ) {
-                       do_random( uri, manager, &passwd, entry, filter,
-                               noattrs, loops, retries, delay, force,
+                       do_random( uri, manager, &passwd, entry, filter, attrs,
+                               noattrs, nobind, loops, retries, delay, force,
                                chaserefs );
 
                } else {
-                       do_read( uri, manager, &passwd, entry, NULL, noattrs,
-                               loops, retries, delay, force, chaserefs );
+                       do_read( uri, manager, &passwd, entry, NULL, attrs,
+                               noattrs, nobind, loops, retries, delay, force,
+                               chaserefs );
                }
        }
 
@@ -193,13 +228,12 @@ main( int argc, char **argv )
 
 static void
 do_random( char *uri, char *manager, struct berval *passwd,
-       char *sbase, char *filter, int noattrs,
+       char *sbase, char *filter, char **srchattrs, int noattrs, int nobind,
        int innerloop, int maxretries, int delay, int force, int chaserefs )
 {
        LDAP    *ld = NULL;
        int     i = 0, do_retry = maxretries;
        char    *attrs[ 2 ];
-       pid_t   pid = getpid();
        int     rc = LDAP_SUCCESS;
        int     version = LDAP_VERSION3;
        int     nvalues = 0;
@@ -224,17 +258,19 @@ do_random( char *uri, char *manager, struct berval *passwd,
                                (long) pid, innerloop, sbase, filter );
        }
 
-       rc = ldap_sasl_bind_s( ld, manager, LDAP_SASL_SIMPLE, passwd, NULL, NULL, NULL );
-       if ( rc != LDAP_SUCCESS ) {
-               tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
-               switch ( rc ) {
-               case LDAP_BUSY:
-               case LDAP_UNAVAILABLE:
-               /* fallthru */
-               default:
-                       break;
+       if ( nobind == 0 ) {
+               rc = ldap_sasl_bind_s( ld, manager, LDAP_SASL_SIMPLE, passwd, NULL, NULL, NULL );
+               if ( rc != LDAP_SUCCESS ) {
+                       tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
+                       switch ( rc ) {
+                       case LDAP_BUSY:
+                       case LDAP_UNAVAILABLE:
+                       /* fallthru */
+                       default:
+                               break;
+                       }
+                       exit( EXIT_FAILURE );
                }
-               exit( EXIT_FAILURE );
        }
 
        rc = ldap_search_ext_s( ld, sbase, LDAP_SCOPE_SUBTREE,
@@ -261,14 +297,21 @@ 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++ ) {
-                       do_read( uri, manager, passwd, values[ rand() % nvalues ], &ld,
-                               noattrs, 1, maxretries, delay, force,
-                               chaserefs );
+#if 0  /* use high-order bits for better randomness (Numerical Recipes in "C") */
+                       int     r = rand() % nvalues;
+#endif
+                       int     r = ((double)nvalues)*rand()/(RAND_MAX + 1.0);
+
+                       do_read( uri, manager, passwd, values[ r ], &ld,
+                               srchattrs, noattrs, nobind, 1, maxretries,
+                               delay, force, chaserefs );
                }
+               free( values );
                break;
 
        default:
@@ -276,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 );
@@ -285,16 +328,13 @@ do_random( char *uri, char *manager, struct berval *passwd,
 
 static void
 do_read( char *uri, char *manager, struct berval *passwd, char *entry,
-       LDAP **ldp, int noattrs, int maxloop,
+       LDAP **ldp, char **attrs, int noattrs, int nobind, int maxloop,
        int maxretries, int delay, int force, int chaserefs )
 {
        LDAP    *ld = ldp ? *ldp : NULL;
        int     i = 0, do_retry = maxretries;
-       char    *attrs[] = { "1.1", NULL };
-       pid_t   pid = getpid();
        int     rc = LDAP_SUCCESS;
        int     version = LDAP_VERSION3;
-       int     first = 1;
 
 retry:;
        if ( ld == NULL ) {
@@ -313,25 +353,28 @@ retry:;
                                (long) pid, maxloop, entry );
                }
 
-               rc = ldap_sasl_bind_s( ld, manager, LDAP_SASL_SIMPLE, passwd, NULL, NULL, NULL );
-               if ( rc != LDAP_SUCCESS ) {
-                       tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
-                       switch ( rc ) {
-                       case LDAP_BUSY:
-                       case LDAP_UNAVAILABLE:
-                               if ( do_retry > 0 ) {
-                                       ldap_unbind_ext( ld, NULL, NULL );
-                                       do_retry--;
-                                       if ( delay != 0 ) {
-                                           sleep( delay );
+               if ( nobind == 0 ) {
+                       rc = ldap_sasl_bind_s( ld, manager, LDAP_SASL_SIMPLE, passwd, NULL, NULL, NULL );
+                       if ( rc != LDAP_SUCCESS ) {
+                               tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
+                               switch ( rc ) {
+                               case LDAP_BUSY:
+                               case LDAP_UNAVAILABLE:
+                                       if ( do_retry > 0 ) {
+                                               ldap_unbind_ext( ld, NULL, NULL );
+                                               ld = NULL;
+                                               do_retry--;
+                                               if ( delay != 0 ) {
+                                                   sleep( delay );
+                                               }
+                                               goto retry;
                                        }
-                                       goto retry;
+                               /* fallthru */
+                               default:
+                                       break;
                                }
-                       /* fallthru */
-                       default:
-                               break;
+                               exit( EXIT_FAILURE );
                        }
-                       exit( EXIT_FAILURE );
                }
        }
 
@@ -341,44 +384,42 @@ retry:;
                rc = ldap_search_ext_s( ld, entry, LDAP_SCOPE_BASE,
                                NULL, attrs, noattrs, NULL, NULL, NULL,
                                LDAP_NO_LIMIT, &res );
-               switch ( rc ) {
-               case LDAP_REFERRAL:
-                       /* don't log: it's intended */
-                       if ( force >= 2 ) {
-                               if ( !first ) {
-                                       break;
+               if ( res != NULL ) {
+                       ldap_msgfree( res );
+               }
+
+               if ( rc ) {
+                       int             first = tester_ignore_err( rc );
+                       char            buf[ BUFSIZ ];
+
+                       snprintf( buf, sizeof( buf ), "ldap_search_ext_s(%s)", entry );
+
+                       /* if ignore.. */
+                       if ( first ) {
+                               /* only log if first occurrence */
+                               if ( ( force < 2 && first > 0 ) || abs(first) == 1 ) {
+                                       tester_ldap_error( ld, buf, NULL );
                                }
-                               first = 0;
+                               continue;
                        }
-                       tester_ldap_error( ld, "ldap_search_ext_s", NULL );
-                       /* fallthru */
-
-               case LDAP_SUCCESS:
-                       break;
 
-               default:
-                       tester_ldap_error( ld, "ldap_search_ext_s", NULL );
+                       /* busy needs special handling */
+                       tester_ldap_error( ld, buf, NULL );
                        if ( rc == LDAP_BUSY && do_retry > 0 ) {
+                               ldap_unbind_ext( ld, NULL, NULL );
+                               ld = NULL;
                                do_retry--;
                                goto retry;
                        }
-                       if ( rc != LDAP_NO_SUCH_OBJECT ) {
-                               goto done;
-                       }
                        break;
                }
-
-               if ( res != NULL ) {
-                       ldap_msgfree( res );
-               }
        }
 
-done:;
        if ( ldp != NULL ) {
                *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 );