Fix passwd clearing bug

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 660ba44c28c08a514a9a5325062b5bdcbc11a514..2bbb3c826f84ebf46f66714527455f0073e8a0bb 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -376,7 +376,7 @@ main( int argc, char **argv )
                {
                        char* p;
 
-                       for( p = optarg; *p == '\0'; p++ ) {
+                       for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 3eb7d1f597743a412703e6ec270827696dafe8e8..3851ad550d91cd2845fcee621c955533641aa72a 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -436,7 +436,7 @@ main( int argc, char **argv )
                {
                        char* p;
 
-                       for( p = optarg; *p == '\0'; p++ ) {
+                       for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index fe225d9af4df838f2a55206d818ce3e9f4767826..3ab276dc33608a2063ab46269ba9b2ba8baec8ed 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -113,7 +113,7 @@ main(int argc, char **argv)
     infile = NULL;
     not = contoper = verbose = remove = want_bindpw =
                debug = manageDSAit = referrals = 0;
-    authmethod = LDAP_AUTH_SIMPLE;
+    authmethod = -1;
        version = -1;
 
     prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
@@ -398,7 +398,7 @@ main(int argc, char **argv)
                {
                        char* p;
 
-                       for( p = optarg; *p == '\0'; p++ ) {
+                       for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 098b1a778b1cc82599c1ae348104f9a26dab8b4f..667d10ec39d880c43d15bbb7c410801d3ba4f931 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -124,7 +124,7 @@ main( int argc, char *argv[] )
                        {
                                char* p;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
+                               for( p = optarg; *p != '\0'; p++ ) {
                                        *p = '\0';
                                }
                        }
@@ -139,7 +139,7 @@ main( int argc, char *argv[] )
                        {
                                char* p;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
+                               for( p = optarg; *p != '\0'; p++ ) {
                                        *p = '\0';
                                }
                        }
@@ -397,7 +397,7 @@ main( int argc, char *argv[] )
                {
                        char* p;
 
-                       for( p = optarg; *p == '\0'; p++ ) {
+                       for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index a7d55c44b667f33922fcaf8e5c334c5d36afd290..28571422cd0278d231ae8804a3d499502e67aeee 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -507,7 +507,7 @@ main( int argc, char **argv )
                {
                        char* p;
 
-                       for( p = optarg; *p == '\0'; p++ ) {
+                       for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }

diff --git a/servers/slapd/tools/slappasswd.c b/servers/slapd/tools/slappasswd.c
index 7222b13db289fc00acf8a7c695bd7fef35aece89..64b7a1be5e2889a83cc56cfc623032f933012990 100644 (file)
--- a/servers/slapd/tools/slappasswd.c
+++ b/servers/slapd/tools/slappasswd.c
@@ -56,6 +56,7 @@ main( int argc, char *argv[] )
                switch (i) {
                case 'h':       /* scheme */
                        scheme = strdup (optarg);
+                       break;
 
                case 's':       /* new password (secret) */
                        newpw = strdup (optarg);
@@ -63,7 +64,7 @@ main( int argc, char *argv[] )
                        {
                                char* p;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
+                               for( p = optarg; *p != '\0'; p++ ) {
                                        *p = '\0';
                                }
                        }