use "authcid" instead of "username".

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 4bcd7923b5919cfcee1f0faf19766f1b9d6789e5..d4e74126b93defce05997fcb784ec0d5d74131db 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -74,12 +74,12 @@ usage( const char *s )
 "  -P version procotol version (default: 3)\n"
 "  -Q         use SASL Quiet mode\n"
 "  -R realm   SASL realm\n"
-"  -U user    SASL authentication identity (username)\n"
+"  -U authcid SASL authentication identity\n"
 "  -v         run in verbose mode (diagnostics to standard output)\n"
 "  -w passwd  bind passwd (for simple authentication)\n"
 "  -W         prompt for bind passwd\n"
 "  -x         Simple authentication\n"
-"  -X id      SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+"  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "  -Y mech    SASL mechanism\n"
 "  -Z         Start TLS request (-ZZ to require successful response)\n"
 ,              s );

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 181a6e656f0347d9da272b456b57eb391c89157c..f919d4e2d1d87dd8e8e87fe3fff6101dca7e82cc 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -121,12 +121,12 @@ usage( const char *prog )
 "  -P version procotol version (default: 3)\n"
 "  -Q         use SASL Quiet mode\n"
 "  -R realm   SASL realm\n"
-"  -U user    SASL authentication identity (username)\n"
+"  -U authcid SASL authentication identity\n"
 "  -v         run in verbose mode (diagnostics to standard output)\n"
 "  -w passwd  bind passwd (for simple authentication)\n"
 "  -W         prompt for bind passwd\n"
 "  -x         Simple authentication\n"
-"  -X id      SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+"  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "  -Y mech    SASL mechanism\n"
 "  -Z         Start TLS request (-ZZ to require successful response)\n"
             , prog, (strcmp( prog, "ldapadd" ) ? " is to replace" : "") );

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 547f20e3699d60a20eb303124491dbc9c6d4a2da..7327d6a6543df756d74f103d51f5508879fd3e4b 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -88,12 +88,12 @@ usage( const char *s )
 "  -P version procotol version (default: 3)\n"
 "  -Q         use SASL Quiet mode\n"
 "  -R realm   SASL realm\n"
-"  -U user    SASL authentication identity (username)\n"
+"  -U authzid SASL authentication identity\n"
 "  -v         run in verbose mode (diagnostics to standard output)\n"
 "  -w passwd  bind passwd (for simple authentication)\n"
 "  -W         prompt for bind passwd\n"
 "  -x         Simple authentication\n"
-"  -X id      SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+"  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "  -Y mech    SASL mechanism\n"
 "  -Z         Start TLS request (-ZZ to require successful response)\n"
 ,              s );

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 8f42c016fdcd0f8a64aa95f140705093161160c3..b79e4d3f23a431caeaccfdcbccb5725c9cfe1277 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -49,12 +49,12 @@ usage(const char *s)
 "  -p port    port on LDAP server\n"
 "  -Q         use SASL Quiet mode\n"
 "  -R realm   SASL realm\n"
-"  -U user    SASL authentication identity (username)\n"
+"  -U authcid SASL authentication identity\n"
 "  -v         run in verbose mode (diagnostics to standard output)\n"
 "  -w passwd  bind passwd (for simple authentication)\n"
 "  -W         prompt for bind passwd\n"
 "  -x         Simple authentication\n"
-"  -X id      SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+"  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "  -Y mech    SASL mechanism\n"
 "  -Z         Start TLS request (-ZZ to require successful response)\n"
                , s );

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index a4b0738f9f910df8782b5de4d2f929889a397b6f..278f3bc589fe448e0869fd3ce1840eadf683bb09 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -81,12 +81,12 @@ usage( const char *s )
 "  -P version procotol version (default: 3)\n"
 "  -Q         use SASL Quiet mode\n"
 "  -R realm   SASL realm\n"
-"  -U user    SASL authentication identity (username)\n"
+"  -U authcid SASL authentication identity\n"
 "  -v         run in verbose mode (diagnostics to standard output)\n"
 "  -w passwd  bind passwd (for simple authentication)\n"
 "  -W         prompt for bind passwd\n"
 "  -x         Simple authentication\n"
-"  -X id      SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+"  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "  -Y mech    SASL mechanism\n"
 "  -Z         Start TLS request (-ZZ to require successful response)\n"
 , s );

diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1
index c1b758f16c3163a916c40e6d918bbfb442d115ec..4d423abd66e17665db4d273c6638bf5a4714f214 100644 (file)
--- a/doc/man/man1/ldapdelete.1
+++ b/doc/man/man1/ldapdelete.1
@@ -41,7 +41,7 @@ ldapdelete \- LDAP delete entry tool
 [\c
 .BR \-O \ security-properties ]
 [\c
-.BI \-U \ username\fR]
+.BI \-U \ authcid\fR]
 [\c
 .BR \-x ]
 [\c
@@ -159,8 +159,8 @@ only as needed.
 .B \-Q
 Enable SASL Quiet mode.  Never prompt.
 .TP
-.BI \-U \ username
-Specify the username for SASL bind. The syntax of the username depends on the
+.BI \-U \ authcid
+Specify the authentication ID for SASL bind. The form of the identity depends on the
 actual SASL mechanism used.
 .TP
 .BI \-X \ authzid

diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
index 3f54b15fabf155398ccd46344c7a8d28869485ff..a16ddb1eae7bae57e4cf70e1aa902486ddcbeea7 100644 (file)
--- a/doc/man/man1/ldapmodify.1
+++ b/doc/man/man1/ldapmodify.1
@@ -47,7 +47,7 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 [\c
 .BR \-Q ]
 [\c
-.BI \-U \ username\fR]
+.BI \-U \ authcid\fR]
 [\c
 .BR \-x ]
 [\c
@@ -97,7 +97,7 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 [\c
 .BR \-Q ]
 [\c
-.BI \-U \ username\fR]
+.BI \-U \ authcid\fR]
 [\c
 .BR \-x ]
 [\c
@@ -220,9 +220,9 @@ only as needed.
 .B \-Q
 Enable SASL Quiet mode.  Never prompt.
 .TP
-.BI \-U \ username
-Specify the username for SASL bind. The syntax of the username depends on the
-actual SASL mechanism used.
+.BI \-U \ authcid
+Specify the authentication ID for SASL bind. The form of the ID
+depends on the actual SASL mechanism used.
 .TP
 .BI \-X \ authzid
 Specify the requested authorization ID for SASL bind.

diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1
index 70890a7a90c12598a9b2b9ae314e05c234784604..757b03cf7782fa5944b92ba98b670cf2e1c614da 100644 (file)
--- a/doc/man/man1/ldapmodrdn.1
+++ b/doc/man/man1/ldapmodrdn.1
@@ -45,7 +45,7 @@ ldapmodrdn \- LDAP rename entry tool
 [\c
 .BR \-Q ]
 [\c
-.BI \-U \ username\fR]
+.BI \-U \ authcid\fR]
 [\c
 .BR \-x ]
 [\c
@@ -154,9 +154,9 @@ only as needed.
 .B \-Q
 Enable SASL Quiet mode.  Never prompt.
 .TP
-.BI \-U \ username
-Specify the username for SASL bind. The syntax of the username depends on the
-actual SASL mechanism used.
+.BI \-U \ authcid
+Specify the authentication ID for SASL bind. The form of the ID
+depends on the actual SASL mechanism used.
 .TP
 .BI \-X \ authzid
 Specify the requested authorization ID for SASL bind.

diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index b37e3df50340c38fa2f8c734472a2fdaeb82070e..5077ff1df50895bdb1918a3b07c366acfa208d66 100644 (file)
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -41,7 +41,7 @@ ldappasswd \- change the password of an LDAP entry
 [\c
 .BR \-Q ]
 [\c
-.BI \-U \ username\fR]
+.BI \-U \ authcid\fR]
 [\c
 .BR \-x ]
 [\c
@@ -135,9 +135,9 @@ only as needed.
 .B \-Q
 Enable SASL Quiet mode.  Never prompt.
 .TP
-.BI \-U \ username
-Specify the username for SASL bind. The syntax of the username depends on the
-actual SASL mechanism used.
+.BI \-U \ authcid
+Specify the authentication ID for SASL bind. The form of the ID
+depends on the actual SASL mechanism used.
 .TP
 .BI \-X \ authzid
 Specify the requested authorization ID for SASL bind.

diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index 45aafa2285973d39a5f874f3ff02c0e90846b577..893843efa4f0efc8d6650f8e6c4eba7a29053098 100644 (file)
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -61,7 +61,7 @@ ldapsearch \- LDAP search tool
 [\c
 .BR \-Q ]
 [\c
-.BI \-U \ username\fR]
+.BI \-U \ authcid\fR]
 [\c
 .BR \-x ]
 [\c
@@ -246,9 +246,9 @@ only as needed.
 .B \-Q
 Enable SASL Quiet mode.  Never prompt.
 .TP
-.BI \-U \ username
-Specify the username for SASL bind. The syntax of the username depends on the
-actual SASL mechanism used.
+.BI \-U \ authcid
+Specify the authentication ID for SASL bind. The form of the ID
+depends on the actual SASL mechanism used.
 .TP
 .BI \-X \ authzid
 Specify the requested authorization ID for SASL bind.