From 041c1545e808bf4914ab5321c6055fd581b2e106 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 10 Dec 1999 04:59:28 +0000
Subject: [PATCH] Update usage and man page.

---
 clients/tools/ldappasswd.c |  4 +++-
 doc/devel/args             |  2 +-
 doc/man/man1/ldappasswd.1  | 30 ++++++++++++++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 0deb9f95d9..43e93fc130 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -28,13 +28,15 @@ usage(const char *s)
 {
 	fprintf(stderr,
 		"Usage: %s [options] dn\n"
+		"  -A\t\tprompt for old password\n"
+		"  -a secret\told password\n"
 		"  -D binddn\tbind dn\n"
 		"  -d level\tdebugging level\n"
 		"  -h host\tldap server (default: localhost)\n"
 		"  -n\t\tmake no modifications\n"
 		"  -p port\tldap port\n"
-		"  -s secret\tnew password\n"
 		"  -S\t\tprompt for new password\n"
+		"  -s secret\tnew password\n"
 		"  -v\t\tincrease verbosity\n"
 		"  -W\t\tprompt for bind password\n"
 		"  -w passwd\tbind password (for simple authentication)\n"
diff --git a/doc/devel/args b/doc/devel/args
index cdf32f99bd..329d88e489 100644
--- a/doc/devel/args
+++ b/doc/devel/args
@@ -7,7 +7,7 @@ go500gw                 I      P          a cd f h   l  p    t   x
 ldapdelete         D      K M  P      W     cd f h  k  np      vw
 ldapmodify         D F    K M  P      W   abcd f h  k  np  r t vw
 ldapmodrdn         D      K M  P      W     cd f h  k  np  rs  vw
-ldappasswd      A  D      KL   P  S       a cd   h  k       stuvw    
+ldappasswd      A  D              S   W   a  d   h          s  vw    
 ldapsearch      AB D F    KLM  P RST VW   ab d f h  kl np   stuvw  z
 mail500           C                          d f h   lm        v
 rcpt500                             U     abc  f h   l  p   st     z
diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index 6772123db9..1e7e585968 100644
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -6,6 +6,10 @@
 ldappasswd \- change the password of an LDAP entry
 .SH SYNOPSIS
 .B ldappasswd
+[\c
+.BR \-A ]
+[\c
+.BI \-a \ oldPasswd\fR]
 .BI \-D \ binddn\fR
 [\c
 .BI \-d \ debuglevel\fR]
@@ -16,6 +20,8 @@ ldappasswd \- change the password of an LDAP entry
 [\c
 .BI \-p \ ldapport\fR]
 [\c
+.BR \-S ]
+[\c
 .BI \-s \ newPasswd\fR]
 [\c
 .BR \-v ]
@@ -31,16 +37,24 @@ It is neither designed nor intended to be a replacement for
 and should not be installed as such.
 .LP
 .B ldappasswd
-sets the password of associated with the user associated with the
-bind DN.
-If the new password is not specified on the command line, the user
-will be prompted to enter it.
+sets the password of associated with the user.  If the new
+password is not specified on the command line or the user
+doesn't enable prompting, the server will be asked to generate
+a password for the user.
 .SH OPTIONS
 .TP
+.BI \-A
+Prompt for old password.
+This is used instead of specifying the password on the command line.
+.TP
+.BI \-a \ oldPasswd
+Set the old password to \fIoldPasswd\fP.
+.TP
 .BI \-D \ binddn
 Use \fIbinddn\fP to bind to the LDAP directory. \fIbinddn\fP should
 be a string-represented DN as defined in RFC 2253.
-This flag is not optional.
+This flag is not optional.  The user DN will be used if the
+bind DN is not provided.
 .TP
 .BI \-d \ debuglevel
 Set the LDAP debugging level to \fIdebuglevel\fP.
@@ -55,8 +69,12 @@ Do not set password. (Can be useful when used in conjunction with
 .BR \-v \ or
 .BR \-d )
 .TP
+.BI \-S
+Prompt for new password.
+This is used instead of specifying the password on the command line.
+.TP
 .BI \-s \ newPasswd
-Set the user password to \fInewPasswd\fP.
+Set the new password to \fInewPasswd\fP.
 .TP
 .BI \-p \ ldapport
 Specify an alternate port on which the ldap server is running.
-- 
2.39.5