From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 2 Dec 2006 10:25:56 +0000 (+0000)
Subject: revert -I for slapd-bind
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e4ab03f1fd10142efa9827ee4fef0ff23496317;p=thirdparty%2Fopenldap.git

revert -I for slapd-bind
---

diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index 0a892e0a99..f89f354629 100644
--- 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 f57bded5cc..f50e2df976 100644
--- 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;