Fix critical argument handling

diff --git a/CHANGES b/CHANGES
index 6c2dea798cb6ddd2c9f728cf4cee36d51d89c535..bc530bcb4c6b2f9929d1f4f52afd01b1e07957fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.1.17 Engineering
        Fixed slapd request flooding bug (ITS#2389)
        Fixed slurpd one shot mode (ITS#2385)
        Fixed slurpd core dump on exit (ITS#2363)
+       Fixed clients critical argument handling
        Removed lint (ITS#2382)
        Documentation
                Update slurpd(8) -u usage

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 864d9262d15548d34a8582b3ba386a1b7e194e8e..880a6b8381b1be63b472806f66f5bb6f5803de34 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -114,10 +114,10 @@ tool_args( int argc, char **argv )
                char *control, *cvalue;
                switch( i ) {
                case 'c':       /* continuous operation mode */
-                       contoper = 1;
+                       contoper++;
                        break;
                case 'C':
-                       referrals = 1;
+                       referrals++;
                        break;
                case 'd':
                        debug |= atoi( optarg );
@@ -260,10 +260,10 @@ tool_args( int argc, char **argv )
                        break;
                case 'M':
                        /* enable Manage DSA IT */
-                       manageDSAit = 1;
+                       manageDSAit++;
                        break;
                case 'n':       /* print operations, don't actually do them */
-                       not = 1;
+                       not++;
                        break;
                case 'O':
 #ifdef HAVE_CYRUS_SASL
@@ -372,7 +372,7 @@ tool_args( int argc, char **argv )
 #endif
                        break;
                case 'v':       /* verbose mode */
-                       verbose = 1;
+                       verbose++;
                        break;
                case 'V':       /* version */
                        version++;
@@ -389,7 +389,7 @@ tool_args( int argc, char **argv )
                        passwd.bv_len = strlen( passwd.bv_val );
                        break;
                case 'W':
-                       want_bindpw = 1;
+                       want_bindpw++;
                        break;
                case 'y':
                        pw_file = optarg;
@@ -440,7 +440,7 @@ tool_args( int argc, char **argv )
                        break;
                case 'Z':
 #ifdef HAVE_TLS
-                       use_tls = 1;
+                       use_tls++;
 #else
                        fprintf( stderr, "%s: not compiled with TLS support\n", prog );
                        exit( EXIT_FAILURE );