From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 3 Dec 2006 21:34:24 +0000 (+0000)
Subject: make sure -i propagates correctly
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~418
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd5e44d4963280316baafd91f02da097bf36a21d;p=thirdparty%2Fopenldap.git

make sure -i propagates correctly
---

diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index 242e320b05..eac2bab56b 100644
--- a/tests/progs/slapd-addel.c
+++ b/tests/progs/slapd-addel.c
@@ -87,8 +87,9 @@ main( int argc, char **argv )
 
 	tester_init( "slapd-addel", TESTER_ADDEL );
 
-	while ( (i = getopt( argc, argv, "CFH:h:p:D:w:f:l:L:r:t:" )) != EOF ) {
-		switch( i ) {
+	while ( ( i = getopt( argc, argv, "CD:Ff:H:h:i:L:l:p:r:t:w:" ) ) != EOF )
+	{
+		switch ( i ) {
 		case 'C':
 			chaserefs++;
 			break;
diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index f89f354629..27e284917e 100644
--- a/tests/progs/slapd-bind.c
+++ b/tests/progs/slapd-bind.c
@@ -120,8 +120,9 @@ main( int argc, char **argv )
 	/* by default, tolerate invalid credentials */
 	tester_ignore_str2errlist( "INVALID_CREDENTIALS" );
 
-	while ( (i = getopt( argc, argv, "a:b:B:H:h:i:p:D:w:l:L:f:FIt:" )) != EOF ) {
-		switch( i ) {
+	while ( ( i = getopt( argc, argv, "a:B:b:D:Ff:H:h:Ii:L:l:p:t:w:" ) ) != EOF )
+	{
+		switch ( i ) {
 		case 'a':
 			pwattr = optarg;
 			break;
diff --git a/tests/progs/slapd-modify.c b/tests/progs/slapd-modify.c
index 95bf19a6b3..648bd7ca5c 100644
--- a/tests/progs/slapd-modify.c
+++ b/tests/progs/slapd-modify.c
@@ -81,7 +81,8 @@ main( int argc, char **argv )
 
 	tester_init( "slapd-modify", TESTER_MODIFY );
 
-	while ( (i = getopt( argc, argv, "CFH:h:i:p:D:w:e:a:l:L:r:t:" )) != EOF ) {
+	while ( ( i = getopt( argc, argv, "a:CD:e:FH:h:i:L:l:p:r:t:w:" ) ) != EOF )
+	{
 		switch ( i ) {
 		case 'C':
 			chaserefs++;
diff --git a/tests/progs/slapd-modrdn.c b/tests/progs/slapd-modrdn.c
index 894a501a7d..11ba36b03c 100644
--- a/tests/progs/slapd-modrdn.c
+++ b/tests/progs/slapd-modrdn.c
@@ -82,8 +82,9 @@ main( int argc, char **argv )
 
 	tester_init( "slapd-modrdn", TESTER_MODRDN );
 
-	while ( (i = getopt( argc, argv, "CFH:h:i:p:D:w:e:l:L:r:t:" )) != EOF ) {
-		switch( i ) {
+	while ( ( i = getopt( argc, argv, "CD:e:FH:h:i:L:l:p:r:t:w:" ) ) != EOF )
+	{
+		switch ( i ) {
 		case 'C':
 			chaserefs++;
 			break;
diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index eb292503e0..5eb9cfec16 100644
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -96,8 +96,8 @@ main( int argc, char **argv )
 	/* by default, tolerate referrals and no such object */
 	tester_ignore_str2errlist( "REFERRAL,NO_SUCH_OBJECT" );
 
-	while ( (i = getopt( argc, argv, "ACD:H:h:i: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:w:" )) != EOF ) {
+		switch ( i ) {
 		case 'A':
 			noattrs++;
 			break;
diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 01da5753e9..77d447a134 100644
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -98,8 +98,9 @@ main( int argc, char **argv )
 	/* by default, tolerate referrals and no such object */
 	tester_ignore_str2errlist( "REFERRAL,NO_SUCH_OBJECT" );
 
-	while ( ( i = getopt( argc, argv, "Aa:b:CD:f:FH:h:i:l:L:Np:w:r:t:" ) ) != EOF ) {
-		switch( i ) {
+	while ( ( i = getopt( argc, argv, "Aa:b:CD:f:FH:h:i:l:L:Np:r:t:w:" ) ) != EOF )
+	{
+		switch ( i ) {
 		case 'A':
 			noattrs++;
 			break;
diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index 58b56f376a..ebdddc6f36 100644
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -205,14 +205,14 @@ main( int argc, char **argv )
 	mloops[0] = '\0';
 	bloops[0] = '\0';
 
-	while ( (i = getopt( argc, argv, "AB:CD:d:FH:h:Ii:j:l:L:NP:p:r:t:Ww:y:" )) != EOF ) {
-		switch( i ) {
+	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++;
 			break;
 
-		case 'B':
-			{
+		case 'B': {
 			char	**p,
 				**b = ldap_str2charray( optarg, "," );
 			extra_t	**epp;
@@ -357,7 +357,9 @@ main( int argc, char **argv )
 
 	if (( dirname == NULL ) || ( port == NULL && uri == NULL ) ||
 			( manager == NULL ) || ( passwd == NULL ) || ( progdir == NULL ))
+	{
 		usage( argv[0], '\0' );
+	}
 
 #ifdef HAVE_WINSOCK
 	children = malloc( maxkids * sizeof(HANDLE) );