make sure -i propagates correctly

diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index 242e320b0527d92a31e60f2b7b9bb3529e32ec0d..eac2bab56bb30d82cc2de239a874e9acf933fe6d 100644 (file)
--- 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 f89f3546299917fd5c0943db2e39e39df7fa8732..27e284917e642169e37a94a3fb9272865f48552d 100644 (file)
--- 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 95bf19a6b32deea88e4286c4281b120644a22eff..648bd7ca5c006bdcc66d5f0c8747ec6b3b55483d 100644 (file)
--- 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 894a501a7d72d021122c44b6fa7b9ddcfb19100e..11ba36b03c648d9f688dae2080e0498761b26167 100644 (file)
--- 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 eb292503e044f2bb4166de7b933112b04620a059..5eb9cfec1683732694a90ea5b39e961c3c226a80 100644 (file)
--- 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 01da5753e9c88051483a54c4d3b1b4cae2958419..77d447a13422b15d3c882a85f22258c57b3d59c3 100644 (file)
--- 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 58b56f376afa89c56fed2081a221fd527d8a6181..ebdddc6f36e1c56942065f671e21e47d97a40464 100644 (file)
--- 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) );