listener:

[openldap] / servers / slapd / tools / slappasswd.c

diff --git a/servers/slapd/tools/slappasswd.c b/servers/slapd/tools/slappasswd.c
index 37c32c4e94a1e41c58e30341831a929c6f7f1269..51d17a583791b5972541d7ef0eba356feb0b80c7 100644 (file)
--- a/servers/slapd/tools/slappasswd.c
+++ b/servers/slapd/tools/slappasswd.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -31,6 +31,8 @@ usage(const char *s)
                "Usage: %s [options]\n"
                "  -h hash\tpassword scheme\n"
                "  -s secret\tnew password\n"
+               "  -c format\tcrypt(3) salt format\n"
+               "  -u\t\tgenerate RFC2307 values (default)\n"
                "  -v\t\tincrease verbosity\n"
                , s );
 
@@ -40,32 +42,38 @@ usage(const char *s)
 int
 main( int argc, char *argv[] )
 {
-       int rc;
        char    *scheme = "{SSHA}";
        char    *newpw = NULL;
 
        int             i;
-       int             version = -1;
        struct berval passwd;
        struct berval *hash = NULL;
 
        while( (i = getopt( argc, argv,
-               "d:h:s:v" )) != EOF )
+               "c:d:h:s:vu" )) != EOF )
        {
                switch (i) {
+               case 'c':       /* crypt salt format */
+                       scheme = "{CRYPT}";
+                       lutil_salt_format( optarg );
+                       break;
+
                case 'h':       /* scheme */
-                       scheme = strdup (optarg);
+                       scheme = strdup( optarg );
+                       break;
 
                case 's':       /* new password (secret) */
-                       newpw = strdup (optarg);
-
                        {
                                char* p;
+                               newpw = strdup( optarg );
 
-                               for( p = optarg; *p == '\0'; p++ ) {
-                                       *p = '*';
+                               for( p = optarg; *p != '\0'; p++ ) {
+                                       *p = '\0';
                                }
-                       }
+
+                       } break;
+
+               case 'u':       /* RFC2307 userPassword */
                        break;
 
                case 'v':       /* verbose */
@@ -87,8 +95,8 @@ main( int argc, char *argv[] )
                newpw = strdup(getpassphrase("New password: "));
                cknewpw = getpassphrase("Re-enter new password: ");
 
-               if( strncmp( newpw, cknewpw, strlen(newpw) )) {
-                       fprintf( stderr, "passwords do not match\n" );
+               if( strcmp( newpw, cknewpw )) {
+                       fprintf( stderr, "Password values do not match\n" );
                        return EXIT_FAILURE;
                }
        }
@@ -104,7 +112,7 @@ main( int argc, char *argv[] )
        }
 
        if( lutil_passwd( hash, &passwd, NULL ) ) {
-               fprintf( stderr, "Password verificaiton failed.\n");
+               fprintf( stderr, "Password verification failed.\n");
                return EXIT_FAILURE;
        }