need a lot of space for stress tests; need to bind for searches to avoid size limits...

diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index b85c488c2cad034e8d26b2ab026cc64315864317..91473e6a62abcfec52ee24f71c8eee806ef5ad92 100644 (file)
--- a/tests/progs/slapd-addel.c
+++ b/tests/progs/slapd-addel.c
@@ -255,6 +255,7 @@ do_addel(
        LDAP    *ld = NULL;
        int     i;
        pid_t   pid = getpid();
+       int     rc = LDAP_SUCCESS;
 
        if ( uri ) {
                ldap_initialize( &ld, uri );
@@ -285,8 +286,8 @@ do_addel(
        for ( i = 0; i < maxloop; i++ ) {
 
                /* add the entry */
-               if ( ldap_add_s( ld, entry, attrs ) != LDAP_SUCCESS ) {
-
+               rc = ldap_add_s( ld, entry, attrs );
+               if ( rc != LDAP_SUCCESS ) {
                        ldap_perror( ld, "ldap_add" );
                        break;
 
@@ -299,8 +300,8 @@ do_addel(
 #endif
 
                /* now delete the entry again */
-               if ( ldap_delete_s( ld, entry ) != LDAP_SUCCESS ) {
-
+               rc = ldap_delete_s( ld, entry );
+               if ( rc != LDAP_SUCCESS ) {
                        ldap_perror( ld, "ldap_delete" );
                        break;
 
@@ -308,7 +309,7 @@ do_addel(
 
        }
 
-       fprintf( stderr, " PID=%ld - Add/Delete done.\n", (long) pid );
+       fprintf( stderr, " PID=%ld - Add/Delete done (%d).\n", (long) pid, rc );
 
        ldap_unbind( ld );
 }

diff --git a/tests/progs/slapd-modify.c b/tests/progs/slapd-modify.c
index b6398da203785d46bfff7e3ef87d10831b6e0e17..a2cc0b71665747a96be3a1815479c0d1884e327f 100644 (file)
--- a/tests/progs/slapd-modify.c
+++ b/tests/progs/slapd-modify.c
@@ -130,6 +130,7 @@ do_modify( char *uri, char *host, int port, char *manager,
        LDAP    *ld = NULL;
        int     i;
        pid_t   pid;
+       int     rc = LDAP_SUCCESS;
 
        struct ldapmod mod;
        struct ldapmod *mods[2];
@@ -170,8 +171,6 @@ do_modify( char *uri, char *host, int port, char *manager,
                 (long) pid, maxloop, entry );
 
        for ( i = 0; i < maxloop; i++ ) {
-               int         rc;
-
                mod.mod_op = LDAP_MOD_ADD;
                if (( rc = ldap_modify_s( ld, entry, mods )) != LDAP_SUCCESS ) {
                        ldap_perror( ld, "ldap_modify" );
@@ -188,7 +187,7 @@ do_modify( char *uri, char *host, int port, char *manager,
 
        }
 
-       fprintf( stderr, " PID=%ld - Modify done.\n", (long) pid );
+       fprintf( stderr, " PID=%ld - Modify done (%d).\n", (long) pid, rc );
 
        ldap_unbind( ld );
 }

diff --git a/tests/progs/slapd-modrdn.c b/tests/progs/slapd-modrdn.c
index e01c360f522e07f3128337784931cfb20708f88d..54f4a2d1476879d48fd4469116e0d738a9ea718b 100644 (file)
--- a/tests/progs/slapd-modrdn.c
+++ b/tests/progs/slapd-modrdn.c
@@ -116,6 +116,8 @@ do_modrdn( char *uri, char *host, int port, char *manager,
        pid_t   pid;
        char *DNs[2];
        char *rdns[2];
+       int         rc = LDAP_SUCCESS;
+
 
        pid = getpid();
        DNs[0] = entry;
@@ -166,8 +168,6 @@ do_modrdn( char *uri, char *host, int port, char *manager,
                 (long) pid, maxloop, entry );
 
        for ( i = 0; i < maxloop; i++ ) {
-               int         rc;
-
                if (( rc = ldap_modrdn2_s( ld, DNs[0], rdns[0], 0 ))
                        != LDAP_SUCCESS ) {
                        ldap_perror( ld, "ldap_modrdn" );
@@ -182,7 +182,7 @@ do_modrdn( char *uri, char *host, int port, char *manager,
                }
        }
 
-       fprintf( stderr, " PID=%ld - Modrdn done.\n", (long) pid );
+       fprintf( stderr, " PID=%ld - Modrdn done (%d).\n", (long) pid, rc );
 
        ldap_unbind( ld );
 }

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index 48b49a87850614f3bef6f839d668260bc0e59d29..83f6914c08d098f37b8ccf5032ff4ac38e0f8bec 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -106,6 +106,7 @@ do_read( char *uri, char *host, int port, char *entry, int maxloop )
        int     i;
        char    *attrs[] = { "1.1", NULL };
        pid_t   pid = getpid();
+       int     rc = LDAP_SUCCESS;
 
        if ( uri ) {
                ldap_initialize( &ld, uri );
@@ -134,11 +135,10 @@ do_read( char *uri, char *host, int port, char *entry, int maxloop )
 
        for ( i = 0; i < maxloop; i++ ) {
                LDAPMessage *res;
-               int         rc;
-
-               if (( rc = ldap_search_s( ld, entry, LDAP_SCOPE_BASE,
-                               NULL, attrs, 1, &res )) != LDAP_SUCCESS ) {
 
+               rc = ldap_search_s( ld, entry, LDAP_SCOPE_BASE,
+                               NULL, attrs, 1, &res );
+               if ( rc != LDAP_SUCCESS ) {
                        ldap_perror( ld, "ldap_read" );
                        if ( rc != LDAP_NO_SUCH_OBJECT ) break;
                        continue;
@@ -148,7 +148,7 @@ do_read( char *uri, char *host, int port, char *entry, int maxloop )
                ldap_msgfree( res );
        }
 
-       fprintf( stderr, " PID=%ld - Read done.\n", (long) pid );
+       fprintf( stderr, " PID=%ld - Read done (%d).\n", (long) pid, rc );
 
        ldap_unbind( ld );
 }

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 220b3a645eb19f920cc8786f4cf4673464628ff6..559a6c0cb6a534f8a84e3ad3157c754a599230bd 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -36,7 +36,7 @@
 #define LOOPS  100
 
 static void
-do_search( char *uri, char *host, int port, char *sbase, char *filter, int maxloop );
+do_search( char *uri, char *host, int port, char *manager, char *passwd, char *sbase, char *filter, int maxloop );
 
 static void
 usage( char *name )
@@ -53,11 +53,13 @@ main( int argc, char **argv )
        char            *uri = NULL;
        char        *host = "localhost";
        int                     port = -1;
+       char            *manager = NULL;
+       char            *passwd = NULL;
        char        *sbase = NULL;
        char            *filter  = NULL;
        int                     loops = LOOPS;
 
-       while ( (i = getopt( argc, argv, "H:h:p:b:f:l:" )) != EOF ) {
+       while ( (i = getopt( argc, argv, "b:D:f:H:h:l:p:w:" )) != EOF ) {
                switch( i ) {
                        case 'H':               /* the server uri */
                                uri = strdup( optarg );
@@ -70,6 +72,14 @@ main( int argc, char **argv )
                                port = atoi( optarg );
                                break;
 
+                       case 'D':               /* the servers manager */
+                               manager = strdup( optarg );
+                       break;
+
+                       case 'w':               /* the server managers password */
+                               passwd = strdup( optarg );
+                       break;
+
                        case 'b':               /* file with search base */
                                sbase = strdup( optarg );
                        break;
@@ -99,18 +109,19 @@ main( int argc, char **argv )
 
        }
 
-       do_search( uri, host, port, sbase, filter, ( 10 * loops ));
+       do_search( uri, host, port, manager, passwd, sbase, filter, ( 10 * loops ));
        exit( EXIT_SUCCESS );
 }
 
 
 static void
-do_search( char *uri, char *host, int port, char *sbase, char *filter, int maxloop )
+do_search( char *uri, char *host, int port, char *manager, char *passwd, char *sbase, char *filter, int maxloop )
 {
        LDAP    *ld = NULL;
        int     i;
        char    *attrs[] = { "cn", "sn", NULL };
        pid_t   pid = getpid();
+       int     rc = LDAP_SUCCESS;
 
        if ( uri ) {
                ldap_initialize( &ld, uri );
@@ -128,7 +139,7 @@ do_search( char *uri, char *host, int port, char *sbase, char *filter, int maxlo
                        &version ); 
        }
 
-       if ( ldap_bind_s( ld, NULL, NULL, LDAP_AUTH_SIMPLE ) != LDAP_SUCCESS ) {
+       if ( ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE ) != LDAP_SUCCESS ) {
                ldap_perror( ld, "ldap_bind" );
                 exit( EXIT_FAILURE );
        }
@@ -139,11 +150,10 @@ do_search( char *uri, char *host, int port, char *sbase, char *filter, int maxlo
 
        for ( i = 0; i < maxloop; i++ ) {
                LDAPMessage *res;
-               int         rc;
-
-               if (( rc = ldap_search_s( ld, sbase, LDAP_SCOPE_SUBTREE,
-                               filter, attrs, 0, &res )) != LDAP_SUCCESS ) {
 
+               rc = ldap_search_s( ld, sbase, LDAP_SCOPE_SUBTREE,
+                               filter, attrs, 0, &res );
+               if ( rc != LDAP_SUCCESS ) {
                        ldap_perror( ld, "ldap_search" );
                        if ( rc != LDAP_NO_SUCH_OBJECT ) break;
                        continue;
@@ -153,7 +163,7 @@ do_search( char *uri, char *host, int port, char *sbase, char *filter, int maxlo
                ldap_msgfree( res );
        }
 
-       fprintf( stderr, " PID=%ld - Search done.\n", (long) pid );
+       fprintf( stderr, " PID=%ld - Search done (%d).\n", (long) pid, rc );
 
        ldap_unbind( ld );
 }

diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index f3be95eaab084cf176812feb0d49a6d852b8dd13..bca80673c22dc5a2d750213f9a931dae112a56d0 100644 (file)
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -40,8 +40,8 @@
 #define ADDCMD                 "slapd-addel"
 #define MODRDNCMD              "slapd-modrdn"
 #define MODIFYCMD              "slapd-modify"
-#define MAXARGS        100
-#define MAXREQS                        20
+#define MAXARGS                100
+#define MAXREQS                        5000
 #define LOOPS                  "100"
 
 #define TSEARCHFILE            "do_search.0"
@@ -240,6 +240,10 @@ main( int argc, char **argv )
                sargs[sanum++] = "-p";
                sargs[sanum++] = port;
        }
+       sargs[sanum++] = "-D";
+       sargs[sanum++] = manager;
+       sargs[sanum++] = "-w";
+       sargs[sanum++] = passwd;
        sargs[sanum++] = "-l";
        sargs[sanum++] = loops;
        sargs[sanum++] = "-b";