A few password related updates.

diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index 933747214af683b6d060b1abb5666ac9bf056311..8e0c3d4ca3273bb85b0467c82237da8ed48c3ddf 100644 (file)
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -147,7 +147,9 @@ Issue StartTLS (Transport Layer Security) extended operation. If you use
 .BR \-ZZ ,
 the command will require the operation to be successful
 .SH SEE ALSO
-.BR ldap_bind (3)
+.BR ldap_sasl_bind (3)
+.BR ldap_extended_operation (3)
+.BR ldap_start_tls (3)
 .SH AUTHOR
 The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS

diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8
index 84d787de27e79eebbd34f81fd9788a2608802db7..706125a18a877003d046df181f70cd627b04c62a 100644 (file)
--- a/doc/man/man8/slappasswd.8
+++ b/doc/man/man8/slappasswd.8
@@ -3,9 +3,10 @@
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .SH NAME
-slappassword \- OpenLDAP password utility
+slappasswd \- OpenLDAP password utility
 .SH SYNOPSIS
 .B SBINDIR/slappasswd
+.B [\-a]
 .B [\-v]
 .B [\-s secret]
 .B [\-h hash]
@@ -20,6 +21,9 @@ as a userPassword value
 .BR rootpw .
 .SH OPTIONS
 .TP
+.B \-a
+generate authPassword values instead of RFC2307 passwords
+.TP
 .B \-v
 enable verbose mode.
 .TP
@@ -27,8 +31,8 @@ enable verbose mode.
 The secret to hash.  If not provided, the user will be prompted
 for the secret to hash.
 .TP
-.BI \-h " hash"
-The hash algorithm to use.  Algorithms supported include
+.BI \-h " scheme"
+The hash scheme to use.  RFC2307 schemes supported include
 .IR {CRYPT} ,
 .IR {MD5} ,
 .IR {SMD5} ,
@@ -36,10 +40,18 @@ The hash algorithm to use.  Algorithms supported include
 .IR {SHA} .
 The default is 
 .IR {SSHA} .
+.LP
+If \-a is specified, the following authPassword schemes
+may be specified:
+.IR MD5 ,
+.IR SHA1 ", and"
+.IR X-CRYPT .
+The default is
+.IR SHA1 .
 .SH LIMITATIONS
 The practice storing hashed passwords in userPassword
 violates Standard Track schema and may hinder
-interoperability.
+interoperability.  authPassword is not yet widely supported.
 .SH "SECURITY CONSIDERATIONS"
 Use of hashed passwords does not protect passwords during
 protocol transfer.  TLS or other eavesdropping protections
@@ -47,7 +59,8 @@ should be inplace before using LDAP simple bind.  The
 hashed password values should be protected as if they
 were clear text passwords.
 .SH "SEE ALSO"
-.BR ldapmodify (3),
+.BR ldappasswd (1),
+.BR ldapmodify (1),
 .BR slapd (8)
 .SH ACKNOWLEDGEMENTS
 .B     OpenLDAP