Update SASL args

diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1
index 480a66ad08975a88f16de9be3240af0806a8de17..8d3f4179f1cbe11f923ab37e123a50a4283e0586 100644 (file)
--- a/doc/man/man1/ldapdelete.1
+++ b/doc/man/man1/ldapdelete.1
@@ -1,4 +1,4 @@
-.TH LDAPDELETE 1 "20 April 2000" "OpenLDAP LDVERSION"
+.TH LDAPDELETE 1 "12 July 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -37,9 +37,7 @@ ldapdelete \- LDAP delete entry tool
 [\c
 .BI \-p \ ldapport\fR]
 [\c
-.BR \-E[E] ]
-[\c
-.BR \-I[I] ]
+.BR \-O \ security-properties ]
 [\c
 .BI \-U \ username\fR]
 [\c
@@ -135,24 +133,8 @@ children, and all their children are deleted down the tree.  No
 verification is done, so if you add this switch, ldapdelete will
 happily delete large portions of your tree.  Use with care.
 .TP
-.B \-E[E]
-Requset the use of SASL privacy (encryption). If the server allows it, data
-sent between the client and the server will be encrypted. If the server
-requires the use of encryption and this flag is not specified, the command
-will fail. If you use
-.B \-EE\c
-, the command will fail if the server does not support encryption.
-.B \-E[E]
-implies
-.B \-I[I]
-.TP
-.B \-I[I]
-Request the use of SASL integrity checking. It protects data sent between the
-client and the server from being modified along the way, but it does not
-prevent sniffing. If the server requires the use of integrity checking and
-this flag is not specified, the command will fail.If you use
-.B \-II\c
-, the command will fail if the server does not support this function. 
+.BI \-O \ security-properties
+Specify SASL security properties.
 .TP
 .BI \-U \ username
 Specify the username for SASL bind. The syntax of the username depends on the
@@ -206,6 +188,8 @@ Kille, S.,
 ISODE Consortium, March 1995.
 .SH BUGS
 There is no interactive mode, but there probably should be.
+.SH AUTHOR
+The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS
 .B     OpenLDAP
 is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).

diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
index 4feb264fa785139485b9a132c5c45ffe7f83c26d..65a1acbeff14bece9b5f55627a23fc0068be4faf 100644 (file)
--- a/doc/man/man1/ldapmodify.1
+++ b/doc/man/man1/ldapmodify.1
@@ -1,4 +1,4 @@
-.TH LDAPMODIFY 1 "20 April 2000" "OpenLDAP LDVERSION"
+.TH LDAPMODIFY 1 "12 July 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -41,9 +41,7 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 [\c
 .BI \-P \ 2\fR\||\|\fI3\fR]
 [\c
-.BR \-E[E] ]
-[\c
-.BR \-I[I] ]
+.BR \-O \ security-properties ]
 [\c
 .BI \-U \ username\fR]
 [\c
@@ -200,24 +198,8 @@ Specify an alternate TCP port where the ldap server is listening.
 .BI \-P \ 2\fR\||\|\fI3
 Specify the LDAP protocol version to use.
 .TP
-.B \-E[E]
-Requset the use of SASL privacy (encryption). If the server allows it, data
-sent between the client and the server will be encrypted. If the server
-requires the use of encryption and this flag is not specified, the command
-will fail. If you use
-.B \-EE\c
-, the command will fail if the server does not support encryption.
-.B \-E[E]
-implies
-.B \-I[I]
-.TP
-.B \-I[I]
-Request the use of SASL integrity checking. It protects data sent between the
-client and the server from being modified along the way, but it does not
-prevent sniffing. If the server requires the use of integrity checking and
-this flag is not specified, the command will fail.If you use
-.B \-II\c
-, the command will fail if the server does not support this function. 
+.BI \-O \ security-properties
+Specify SASL security properties.
 .TP
 .BI \-U \ username
 Specify the username for SASL bind. The syntax of the username depends on the
@@ -426,6 +408,8 @@ Kille, S.,
 ISODE Consortium, March 1995.
 .SH BUGS
 There is no interactive mode, but there probably should be.
+.SH AUTHOR
+The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS
 .B     OpenLDAP
 is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).

diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1
index e85ddd69ab0140353ea1b16a3e6e15794f5e1819..4865e4110ef0b6d41967470f7697827b2871475e 100644 (file)
--- a/doc/man/man1/ldapmodrdn.1
+++ b/doc/man/man1/ldapmodrdn.1
@@ -1,4 +1,4 @@
-.TH LDAPMODRDN 1 "20 April 2000" "OpenLDAP LDVERSION"
+.TH LDAPMODRDN 1 "12 July 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -37,9 +37,7 @@ ldapmodrdn \- LDAP rename entry tool
 [\c
 .BI \-P \ 2\fR\||\|\fI3\fR]
 [\c
-.BR \-E[E] ]
-[\c
-.BR \-I[I] ]
+.BR \-O \ security-properties ]
 [\c
 .BI \-U \ username\fR]
 [\c
@@ -131,24 +129,8 @@ Specify an alternate TCP port where the ldap server is listening.
 .BI \-P \ 2\fR\||\|\fI3
 Specify the LDAP protocol version to use.
 .TP
-.B \-E[E]
-Requset the use of SASL privacy (encryption). If the server allows it, data
-sent between the client and the server will be encrypted. If the server
-requires the use of encryption and this flag is not specified, the command
-will fail. If you use
-.B \-EE\c
-, the command will fail if the server does not support encryption.
-.B \-E[E]
-implies
-.B \-I[I]
-.TP
-.B \-I[I]
-Request the use of SASL integrity checking. It protects data sent between the
-client and the server from being modified along the way, but it does not
-prevent sniffing. If the server requires the use of integrity checking and
-this flag is not specified, the command will fail.If you use
-.B \-II\c
-, the command will fail if the server does not support this function. 
+.BI \-O \ security-properties
+Specify SASL security properties.
 .TP
 .BI \-U \ username
 Specify the username for SASL bind. The syntax of the username depends on the
@@ -225,6 +207,8 @@ Kille, S.,
 ISODE Consortium, March 1995.
 .SH BUGS
 There is no interactive mode, but there probably should be.
+.SH AUTHOR
+The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS
 .B     OpenLDAP
 is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).

diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index a985647f5a06eaf52247a2cece66521c935a6d37..b599b99ae09d0a051047f4ebf55f96f886293312 100644 (file)
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -1,4 +1,4 @@
-.TH LDAPPASSWD 1 "20 April 2000" "LDAPPasswd"
+.TH LDAPPASSWD 1 "12 July 2000" "LDAPPasswd"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -33,9 +33,7 @@ ldappasswd \- change the password of an LDAP entry
 [\c
 .BI \-w \ passwd\fR]
 [\c
-.BR \-E[E] ]
-[\c
-.BR \-I[I] ]
+.BR \-O \ security-properties ]
 [\c
 .BI \-U \ username\fR]
 [\c
@@ -107,24 +105,8 @@ This is used instead of specifying the password on the command line.
 .BI \-w \ passwd
 Use \fIpasswd\fP as the password to bind with.
 .TP
-.B \-E[E]
-Requset the use of SASL privacy (encryption). If the server allows it, data
-sent between the client and the server will be encrypted. If the server
-requires the use of encryption and this flag is not specified, the command
-will fail. If you use
-.B \-EE\c
-, the command will fail if the server does not support encryption.
-.B \-E[E]
-implies
-.B \-I[I]
-.TP
-.B \-I[I]
-Request the use of SASL integrity checking. It protects data sent between the
-client and the server from being modified along the way, but it does not
-prevent sniffing. If the server requires the use of integrity checking and
-this flag is not specified, the command will fail.If you use
-.B \-II\c
-, the command will fail if the server does not support this function. 
+.BI \-O \ security-properties
+Specify SASL security properties.
 .TP
 .BI \-U \ username
 Specify the username for SASL bind. The syntax of the username depends on the
@@ -150,6 +132,8 @@ Issue StartTLS (Transport Layer Security) extended operation. If you use
 , the command will require the operation to be successful.
 .SH SEE ALSO
 .BR ldap_bind (3)
+.SH AUTHOR
+The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS
 .B     OpenLDAP
 is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).

diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index 0c59f5231edeec86deb9e67b949adecb7e1c5c61..261c8eb062154f9ab1ec96a3699d39127d3d3229 100644 (file)
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -1,4 +1,4 @@
-.TH LDAPSEARCH 1 "20 April 2000" "OpenLDAP LDVERSION"
+.TH LDAPSEARCH 1 "12 July 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -53,9 +53,7 @@ ldapsearch \- LDAP search tool
 [\c
 .BI \-z \ sizelimit\fR]
 [\c
-.BR \-E[E] ]
-[\c
-.BR \-I[I] ]
+.BR \-O \ security-properties ]
 [\c
 .BI \-U \ username\fR]
 [\c
@@ -222,29 +220,14 @@ limit.
 A server may impose a maximal sizelimit which only
 the root user may override.
 .TP
-.B \-E[E]
-Requset the use of SASL privacy (encryption). If the server allows it, data
-sent between the client and the server will be encrypted. If the server
-requires the use of encryption and this flag is not specified, the command
-will fail. If you use
-.B \-EE\c
-, the command will fail if the server does not support encryption.
-.B \-E[E]
-implies
-.B \-I[I]
-.TP
-.B \-I[I]
-Request the use of SASL integrity checking. It protects data sent between the
-client and the server from being modified along the way, but it does not
-prevent sniffing. If the server requires the use of integrity checking and
-this flag is not specified, the command will fail.If you use
-.B \-II\c
-, the command will fail if the server does not support this function. 
+.BI \-O \ security-properties
+Specify SASL security properties.
 .TP
 .BI \-U \ username
 Specify the username for SASL bind. The syntax of the username depends on the
 actual SASL mechanism used.
 .TP
+.TP
 .BI \-X \ authzid
 Specify the requested authorization ID for SASL bind.
 .I authzid
@@ -390,6 +373,8 @@ Howes, T.,
 .SM RFC
 1558,
 University of Michigan, December 1993.
+.SH AUTHOR
+The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS
 .B     OpenLDAP
 is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).