Add -y support to ldappasswd.c

s/passwd/password/ in usage description

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 880a6b8381b1be63b472806f66f5bb6f5803de34..d39b3d9bd8f9fe11067d5be1d58dfd509a41082a 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -84,11 +84,11 @@ tool_common_usage( void )
 "  -U authcid SASL authentication identity\n",
 "  -v         run in verbose mode (diagnostics to standard output)\n",
 "  -V         print version info (-VV only)\n",
-"  -w passwd  bind passwd (for simple authentication)\n",
-"  -W         prompt for bind passwd\n",
+"  -w passwd  bind password (for simple authentication)\n",
+"  -W         prompt for bind password\n",
 "  -x         Simple authentication\n",
 "  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n",
-"  -y file    Read passwd from file\n",
+"  -y file    Read password from file\n",
 "  -Y mech    SASL mechanism\n",
 "  -Z         Start TLS request (-ZZ to require successful response)\n",
 NULL

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index a0265f4ebdc5fa9b8e7dbc0b48898c7fe9c20d0a..baf18f6b6a3a631f981161957b7bafd44cf7c7cf 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -49,7 +49,7 @@ usage( void )
 
 
 const char options[] = "a:As:S"
-       "Cd:D:e:h:H:InO:p:QR:U:vVw:WxX:Y:Z";
+       "Cd:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )