From 867ed1c7c81da9b60ed3c32f1b763fcfcc9691fd Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 18 Jan 2001 08:04:56 +0000 Subject: [PATCH] use "authcid" instead of "username". --- clients/tools/ldapdelete.c | 4 ++-- clients/tools/ldapmodify.c | 4 ++-- clients/tools/ldapmodrdn.c | 4 ++-- clients/tools/ldappasswd.c | 4 ++-- clients/tools/ldapsearch.c | 4 ++-- doc/man/man1/ldapdelete.1 | 6 +++--- doc/man/man1/ldapmodify.1 | 10 +++++----- doc/man/man1/ldapmodrdn.1 | 8 ++++---- doc/man/man1/ldappasswd.1 | 8 ++++---- doc/man/man1/ldapsearch.1 | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index 4bcd7923b5..d4e74126b9 100644 --- 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:\" or \"u:\")\n" +" -X authzid SASL authorization identity (\"dn:\" or \"u:\")\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 181a6e656f..f919d4e2d1 100644 --- 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:\" or \"u:\")\n" +" -X authzid SASL authorization identity (\"dn:\" or \"u:\")\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 547f20e369..7327d6a654 100644 --- 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:\" or \"u:\")\n" +" -X authzid SASL authorization identity (\"dn:\" or \"u:\")\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 8f42c016fd..b79e4d3f23 100644 --- 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:\" or \"u:\")\n" +" -X authzid SASL authorization identity (\"dn:\" or \"u:\")\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 a4b0738f9f..278f3bc589 100644 --- 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:\" or \"u:\")\n" +" -X authzid SASL authorization identity (\"dn:\" or \"u:\")\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 c1b758f16c..4d423abd66 100644 --- 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 3f54b15fab..a16ddb1eae 100644 --- 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 70890a7a90..757b03cf77 100644 --- 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 b37e3df503..5077ff1df5 100644 --- 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 45aafa2285..893843efa4 100644 --- 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. -- 2.39.5