From 6f63134b2652db64a86a7fb59a387e0fbaefc975 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 25 Aug 2000 05:31:59 +0000 Subject: [PATCH] Add support for "-H uri" --- doc/man/man1/ldapdelete.1 | 7 ++++++ doc/man/man1/ldapmodify.1 | 7 ++++++ doc/man/man1/ldapmodrdn.1 | 11 ++++++++-- doc/man/man1/ldappasswd.1 | 13 ++++++++--- doc/man/man1/ldapsearch.1 | 7 ++++++ doc/man/man8/slappasswd.8 | 46 +++++++++++++++++++++------------------ 6 files changed, 65 insertions(+), 26 deletions(-) diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1 index f9c90b9e16..a9373cabe9 100644 --- a/doc/man/man1/ldapdelete.1 +++ b/doc/man/man1/ldapdelete.1 @@ -31,6 +31,8 @@ ldapdelete \- LDAP delete entry tool [\c .BI \-w \ passwd\fR] [\c +.BI \-H \ ldapuri\fR] +[\c .BI \-h \ ldaphost\fR] [\c .BI \-P \ 2\fR\||\|\fI3\fR] @@ -127,11 +129,16 @@ This is used instead of specifying the password on the command line. .BI \-w \ passwd Use \fIpasswd\fP as the password for simple authentication. .TP +.BI \-H \ ldapuri +Specify URI(s) referring to the ldap server(s). +.TP .BI \-h \ ldaphost Specify an alternate host on which the ldap server is running. +Deprecated in favor of -H. .TP .BI \-p \ ldapport Specify an alternate TCP port where the ldap server is listening. +Deprecated in favor of -H. .TP .BI \-P \ 2\fR\||\|\fI3 Specify the LDAP protocol version to use. diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1 index 2d5f5387fe..8a93505a77 100644 --- a/doc/man/man1/ldapmodify.1 +++ b/doc/man/man1/ldapmodify.1 @@ -35,6 +35,8 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools [\c .BI \-w \ passwd\fR] [\c +.BI \-H \ ldapuri\fR] +[\c .BI \-h \ ldaphost\fR] [\c .BI \-p \ ldapport\fR] @@ -197,11 +199,16 @@ This is used instead of specifying the password on the command line. .BI \-w \ passwd Use \fIpasswd\fP as the password for simple authentication. .TP +.BI \-H \ ldapuri +Specify URI(s) referring to the ldap server(s). +.TP .BI \-h \ ldaphost Specify an alternate host on which the ldap server is running. +Deprecated in favor of -H. .TP .BI \-p \ ldapport Specify an alternate TCP port where the ldap server is listening. +Deprecated in favor of -H. .TP .BI \-P \ 2\fR\||\|\fI3 Specify the LDAP protocol version to use. diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1 index 03675c938b..f0b3db990a 100644 --- a/doc/man/man1/ldapmodrdn.1 +++ b/doc/man/man1/ldapmodrdn.1 @@ -31,6 +31,8 @@ ldapmodrdn \- LDAP rename entry tool [\c .BI \-w \ passwd\fR] [\c +.BI \-H \ ldapuri\fR] +[\c .BI \-h \ ldaphost\fR] [\c .BI \-p \ ldapport\fR] @@ -128,11 +130,16 @@ This is used instead of specifying the password on the command line. .B \-w passwd Use \fIpasswd\fP as the password for simple authentication. .TP -.B \-h ldaphost +.BI \-H \ ldapuri +Specify URI(s) referring to the ldap server(s). +.TP +.BI \-h \ ldaphost Specify an alternate host on which the ldap server is running. +Deprecated in favor of -H. .TP -.B \-p ldapport +.BI \-p \ ldapport Specify an alternate TCP port where the ldap server is listening. +Deprecated in favor of -H. .TP .BI \-P \ 2\fR\||\|\fI3 Specify the LDAP protocol version to use. diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1 index 512c7d5367..4660f77de5 100644 --- a/doc/man/man1/ldappasswd.1 +++ b/doc/man/man1/ldappasswd.1 @@ -17,6 +17,8 @@ ldappasswd \- change the password of an LDAP entry [\c .BI \-d \ debuglevel\fR] [\c +.BI \-H \ ldapuri\fR] +[\c .BI \-h \ ldaphost\fR] [\c .BR \-n ] @@ -87,8 +89,16 @@ Set the LDAP debugging level to \fIdebuglevel\fP. .B ldappasswd must be compiled with LDAP_DEBUG defined for this option to have any effect. .TP +.BI \-H \ ldapuri +Specify URI(s) referring to the ldap server(s). +.TP .BI \-h \ ldaphost Specify an alternate host on which the ldap server is running. +Deprecated in favor of -H. +.TP +.BI \-p \ ldapport +Specify an alternate TCP port where the ldap server is listening. +Deprecated in favor of -H. .TP .B \-n Do not set password. (Can be useful when used in conjunction with @@ -102,9 +112,6 @@ This is used instead of specifying the password on the command line. .BI \-s \ newPasswd Set the new password to \fInewPasswd\fP. .TP -.BI \-p \ ldapport -Specify an alternate port on which the ldap server is running. -.TP .B \-v Increase the verbosity of output. Can be specified multiple times. .TP diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1 index b35b00cd72..30683779b6 100644 --- a/doc/man/man1/ldapsearch.1 +++ b/doc/man/man1/ldapsearch.1 @@ -37,6 +37,8 @@ ldapsearch \- LDAP search tool [\c .BI \-w \ bindpasswd\fR] [\c +.BI \-H \ ldapuri\fR] +[\c .BI \-h \ ldaphost\fR] [\c .BI \-p \ ldapport\fR] @@ -176,11 +178,16 @@ This is used instead of specifying the password on the command line. .BI \-w \ bindpasswd Use \fIbindpasswd\fP as the password for simple authentication. .TP +.BI \-H \ ldapuri +Specify URI(s) referring to the ldap server(s). +.TP .BI \-h \ ldaphost Specify an alternate host on which the ldap server is running. +Deprecated in favor of -H. .TP .BI \-p \ ldapport Specify an alternate TCP port where the ldap server is listening. +Deprecated in favor of -H. .TP .BI \-b \ searchbase Use \fIsearchbase\fP as the starting point for the search instead of diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8 index a99091c5f8..f33c5a2701 100644 --- a/doc/man/man8/slappasswd.8 +++ b/doc/man/man8/slappasswd.8 @@ -6,7 +6,7 @@ slappasswd \- OpenLDAP password utility .SH SYNOPSIS .B SBINDIR/slappasswd -.B [\-a] +.B [\-u] .B [\-v] .B [\-s secret] .B [\-h hash] @@ -15,14 +15,17 @@ slappasswd \- OpenLDAP password utility .SH DESCRIPTION .LP .B Slappasswd -is used to compute a hashed password suitable for use -as a userPassword value +is used to generate an authPassword (or userPassword) value +suitable for use with +.BR ldapmodify (1) +or .BR slapd.conf (5) -.BR rootpw . +.I rootpw +coniguration directive. .SH OPTIONS .TP -.B \-a -generate authPassword values instead of RFC2307 passwords +.B \-u +generate RFC2307 userPassword values instead of authPassword values. .TP .B \-v enable verbose mode. @@ -32,7 +35,15 @@ The secret to hash. If not provided, the user will be prompted for the secret to hash. .TP .BI \-h " scheme" -The hash scheme to use. RFC2307 schemes supported include +The hash scheme to use. One of the following authPassword schemes +may be specified: +.IR MD5 , +.IR SHA1 ", and" +.IR X-CRYPT . +The default is +.IR SHA1 . +If -u is specified, one of the following RFC2307 schemes may +be specified: .IR {CRYPT} , .IR {MD5} , .IR {SMD5} , @@ -41,17 +52,10 @@ The hash scheme to use. RFC2307 schemes supported include 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. authPassword is not yet widely supported. +The authPassword attribute type is not yet widely supported. +The practice storing hashed passwords in userPassword violates +Standard Track schema and may hinder interoperability. .SH "SECURITY CONSIDERATIONS" Use of hashed passwords does not protect passwords during protocol transfer. TLS or other eavesdropping protections @@ -62,10 +66,10 @@ were clear text passwords. .BR ldappasswd (1), .BR ldapmodify (1), .BR slapd (8) +.BR slapd.conf (5) .LP "OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/) .SH ACKNOWLEDGEMENTS -.B OpenLDAP -is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). -.B OpenLDAP -is derived from University of Michigan LDAP 3.3 Release. +OpenLDAP is developed and maintained by +The OpenLDAP Project (http://www.openldap.org/). +OpenLDAP is derived from University of Michigan LDAP 3.3 Release. -- 2.39.5