Rework last commit for better forward compatibility

diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8
index 6dfad78a059585f7fc60db3d1d008d4b0be4993a..77ffd39490f3c5668d66061261fa448b3fe201c3 100644 (file)
--- a/doc/man/man8/slappasswd.8
+++ b/doc/man/man8/slappasswd.8
@@ -7,8 +7,9 @@ slappasswd \- OpenLDAP password utility
 .SH SYNOPSIS
 .B SBINDIR/slappasswd
 .B [\-v]
+.B [\-u]
 .B [\-s secret]
-.B [\-u hash]
+.B [\-h hash]
 .B 
 .LP
 .SH DESCRIPTION
@@ -25,12 +26,16 @@ coniguration directive.
 .TP
 .B \-v
 enable verbose mode.
+.B \-u
+generate RFC2307 userPassword values (the default).  Future
+versions of this program may generate alternative syntaxes
+by default.  This option is provided for forward compatibility.
 .TP
 .BI \-s " secret"
 The secret to hash.  If not provided, the user will be prompted
 for the secret to hash.
 .TP
-If -u is specified, one of the following RFC2307 schemes may
+If -h is specified, one of the following RFC2307 schemes may
 be specified:
 .IR {CRYPT} ,
 .IR {MD5} ,
@@ -43,7 +48,8 @@ The default is
 .SH LIMITATIONS
 The practice storing hashed passwords in userPassword violates
 Standard Track (RFC2256) schema specifications and may hinder
-interoperability.  
+interoperability.  A new attribute type to hold hashed
+passwords is needed.
 .SH "SECURITY CONSIDERATIONS"
 Use of hashed passwords does not protect passwords during
 protocol transfer.  TLS or other eavesdropping protections

diff --git a/servers/slapd/tools/slappasswd.c b/servers/slapd/tools/slappasswd.c
index d1e40afaa39f18fc0456ce60ad6711d794c384f0..7222b13db289fc00acf8a7c695bd7fef35aece89 100644 (file)
--- a/servers/slapd/tools/slappasswd.c
+++ b/servers/slapd/tools/slappasswd.c
@@ -29,8 +29,9 @@ usage(const char *s)
 {
        fprintf(stderr,
                "Usage: %s [options]\n"
-               "  -u hash\tpassword scheme\n"
+               "  -h hash\tpassword scheme\n"
                "  -s secret\tnew password\n"
+               "  -u\t\tgenerate RFC2307 values\n"
                "  -v\t\tincrease verbosity\n"
                , s );
 
@@ -50,10 +51,10 @@ main( int argc, char *argv[] )
        struct berval *hash = NULL;
 
        while( (i = getopt( argc, argv,
-               "d:u:s:v" )) != EOF )
+               "d:h:s:vu" )) != EOF )
        {
                switch (i) {
-               case 'u':       /* scheme */
+               case 'h':       /* scheme */
                        scheme = strdup (optarg);
 
                case 's':       /* new password (secret) */
@@ -68,6 +69,9 @@ main( int argc, char *argv[] )
                        }
                        break;
 
+               case 'u':       /* RFC2307 userPassword */
+                       break;
+
                case 'v':       /* verbose */
                        verbose++;
                        break;