revert -I for slapd-bind

diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index 0a892e0a9989584c6340db5fe01cdd37f936b240..f89f3546299917fd5c0943db2e39e39df7fa8732 100644 (file)
--- a/tests/progs/slapd-bind.c
+++ b/tests/progs/slapd-bind.c
@@ -98,7 +98,7 @@ main( int argc, char **argv )
        int             outerloops = 1;
        int             force = 0;
        int             chaserefs = 0;
-       int             noinit = 0;
+       int             noinit = 1;
        int             delay = 0;
 
        /* extra action to do after bind... */
@@ -225,7 +225,7 @@ main( int argc, char **argv )
 
                case 'I':
                        /* reuse connection */
-                       noinit++;
+                       noinit = 0;
                        break;
 
                case 't':

diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index f57bded5cc0ee51db4d7f22c1e493801c2d39903..f50e2df976113031cd2b10a0abbb8f1017f4e827 100644 (file)
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -125,6 +125,7 @@ main( int argc, char **argv )
        int             chaserefs = 0;
        int             noattrs = 0;
        int             nobind = 0;
+       int             noinit = 1;
        char            *ignore = NULL;
        /* search */
        char            *sfile = NULL;
@@ -203,7 +204,7 @@ main( int argc, char **argv )
        mloops[0] = '\0';
        bloops[0] = '\0';
 
-       while ( (i = getopt( argc, argv, "AB:CD:d:FH:h:i:j:l:L:NP:p:r:t:w:Wy:" )) != EOF ) {
+       while ( (i = getopt( argc, argv, "AB:CD:d:FH:h:Ii:j:l:L:NP:p:r:t:Ww:y:" )) != EOF ) {
                switch( i ) {
                case 'A':
                        noattrs++;
@@ -252,6 +253,10 @@ main( int argc, char **argv )
                        host = strdup( optarg );
                        break;
 
+               case 'I':
+                       noinit = 0;
+                       break;
+
                case 'i':
                        ignore = optarg;
                        break;
@@ -696,7 +701,9 @@ main( int argc, char **argv )
        snprintf( bcmd, sizeof bcmd, "%s" LDAP_DIRSEP BINDCMD,
                progdir );
        bargs[banum++] = bcmd;
-       bargs[banum++] = "-I";  /* don't init on each bind */
+       if ( !noinit ) {
+               bargs[banum++] = "-I";  /* init on each bind */
+       }
        if ( uri ) {
                bargs[banum++] = "-H";
                bargs[banum++] = uri;