Suck in last minute devel changes

diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1
index ec231f8a1ba49595fadaecdbc89bfc39f16c3f77..450eda31a7f72a361802636638a3c2502fbf429e 100644 (file)
--- a/doc/man/man1/ldapdelete.1
+++ b/doc/man/man1/ldapdelete.1
@@ -1,4 +1,4 @@
-.TH LDAPDELETE 1 "12 July 2000" "OpenLDAP LDVERSION"
+.TH LDAPDELETE 1 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -62,9 +62,10 @@ library call.
 .LP
 .B ldapdelete
 opens a connection to an LDAP server, binds, and deletes one or more
-entries.  If one or more \fIdn\fP arguments are provided, entries with
-those Distinguished Names are deleted.  Each \fIdn\fP should be a
-string-represented DN as defined in RFC 1779.  If no \fIdn\fP arguments
+entries.  If one or more \fIDN\fP arguments are provided, entries with
+those Distinguished Names are deleted.  Each \fIDN\fP should be provided
+using the LDAPv3 string representation as defined in RFC 2253.
+If no \fIdn\fP arguments
 are provided, a list of DNs is read from standard input (or from
 \fIfile\fP if the -f flag is used).
 .SH OPTIONS
@@ -117,8 +118,7 @@ replaced with a line from \fIfile\fP.
 Use simple authentication instead of SASL.
 .TP
 .BI \-D \ binddn
-Use \fIbinddn\fP to bind to the LDAP directory. \fIbinddn\fP should be
-a string-represented DN as defined in RFC 1779.
+Use the Distinguished Name \fIbinddn\fP to bind to the LDAP directory.
 .TP
 .B \-W
 Prompt for simple authentication.
@@ -196,12 +196,6 @@ status and a diagnostic message being written to standard error.
 .BR ldapsearch (1),
 .BR ldap (3),
 .BR ldap_delete (3)
-.LP
-Kille, S.,
-.IR "A String Representation of Distinguished Names",
-.SM RFC
-1779,
-ISODE Consortium, March 1995.
 .SH BUGS
 There is no interactive mode, but there probably should be.
 .SH AUTHOR

diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
index 6c001b38c6a429c9fdbdcd98f22bc09a222c09e4..ac41baef9edf2d94a83a69093dec116e0ce3f6d3 100644 (file)
--- a/doc/man/man1/ldapmodify.1
+++ b/doc/man/man1/ldapmodify.1
@@ -1,4 +1,4 @@
-.TH LDAPMODIFY 1 "12 July 2000" "OpenLDAP LDVERSION"
+.TH LDAPMODIFY 1 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -188,8 +188,7 @@ standard input.
 Use simple authentication instead of SASL.
 .TP
 .BI \-D \ binddn
-Use \fIbinddn\fP to bind to the LDAP directory. \fIbinddn\fP should be
-a string-represented DN as defined in RFC 1779.
+Use the Distinguished Name \fIbinddn\fP to bind to the LDAP directory.
 .TP
 .B \-W
 Prompt for simple authentication.
@@ -416,12 +415,6 @@ status and a diagnostic message being written to standard error.
 .BR ldap_modify (3),
 .BR ldap_modrdn (3),
 .BR slapd.replog (5)
-.LP
-Kille, S.,
-.IR "A String Representation of Distinguished Names",
-.SM RFC
-1779,
-ISODE Consortium, March 1995.
 .SH BUGS
 There is no interactive mode, but there probably should be.
 .SH AUTHOR

diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1
index 56d4b9c00f18545caf4ac2a6c9bfbfd179a4eba2..9bb794ab9561527e8e340c76caea4f09708c5901 100644 (file)
--- a/doc/man/man1/ldapmodrdn.1
+++ b/doc/man/man1/ldapmodrdn.1
@@ -1,4 +1,4 @@
-.TH LDAPMODRDN 1 "12 July 2000" "OpenLDAP LDVERSION"
+.TH LDAPMODRDN 1 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -119,8 +119,7 @@ standard input or the command-line.
 Use simple authentication instead of SASL.
 .TP
 .B \-D binddn
-Use \fIbinddn\fP to bind to the LDAP directory. \fIbinddn\fP should be
-a string-represented DN as defined in RFC 1779.
+Use the Distinguished Name \fIbinddn\fP to bind to the LDAP directory.
 .TP
 .B \-W
 Prompt for simple authentication.
@@ -215,12 +214,6 @@ status and a diagnostic message being written to standard error.
 .BR ldap.conf (5),
 .BR ldap (3),
 .BR ldap_modrdn2 (3)
-.LP
-Kille, S.,
-.IR "A String Representation of Distinguished Names",
-.SM RFC
-1779,
-ISODE Consortium, March 1995.
 .SH BUGS
 There is no interactive mode, but there probably should be.
 .SH AUTHOR

diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index 8e0c3d4ca3273bb85b0467c82237da8ed48c3ddf..512c7d536753c0ba389d40f84d226a376e47a3bd 100644 (file)
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -1,4 +1,4 @@
-.TH LDAPPASSWD 1 "12 July 2000" "LDAPPasswd"
+.TH LDAPPASSWD 1 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -78,8 +78,7 @@ Automatically chase referrals.
 Use simple authentication instead of SASL.
 .TP
 .BI \-D \ binddn
-Use \fIbinddn\fP to bind to the LDAP directory. \fIbinddn\fP should
-be a string-represented DN as defined in RFC 2253.
+Use the Distinguished Name \fIbinddn\fP to bind to the LDAP directory.
 This flag is not optional.  The user DN will be used if the
 bind DN is not provided.
 .TP

diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index 6df7eac3a24a0cdd692efc290b1c7c1e2bc09c6e..b35b00cd7202c2ab944b0360389ad723289f1501 100644 (file)
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -1,4 +1,4 @@
-.TH LDAPSEARCH 1 "12 July 2000" "OpenLDAP LDVERSION"
+.TH LDAPSEARCH 1 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -80,7 +80,7 @@ library call.
 .B ldapsearch
 opens a connection to an LDAP server, binds, and performs a search
 using the filter \fIfilter\fP.  The \fIfilter\fP should conform to
-the string representation for LDAP filters as defined in RFC 1558.
+the string representation for search filters as defined in RFC 2254.
 .LP
 If
 .B ldapsearch
@@ -97,21 +97,22 @@ Show what would be done, but don't actually perform the search.  Useful for
 debugging in conjunction with -v.
 .TP
 .B \-u
-Include the User Friendly form of the Distinguished Name (DN) in the output
+Include the User Friendly Name form of the Distinguished Name (DN)
+in the output.
 .TP
 .B \-v
-Run in verbose mode, with many diagnostics written to standard output
+Run in verbose mode, with many diagnostics written to standard output.
 .TP
 .B \-k
 Use Kerberos authentication instead of simple authentication.  It is
 assumed that you already have a valid ticket granting ticket.
 .B ldapsearch
-must be compiled with KERBEROS defined for this option to have any effect.
+must be compiled with Kerberos for this option to have any effect.
 .TP
 .B \-K
-Same as \-k, but only does step 1 of the kerberos bind.  This is useful
+Same as \-k, but only does step 1 of the Kerberos bind.  This is useful
 when connecting to a slapd and there is no x500dsa.hostname principal
-registered with your kerberos servers.
+registered with your Kerberos servers.
 .TP
 .B \-t
 Write retrieved values to a set of temporary files.  This is useful for
@@ -123,11 +124,12 @@ see if an attribute is present in an entry and are not interested in the
 specific values.
 .TP
 .B \-L
-Display search results in
-.BR ldif (5)
-format.  A second -L disables comments. A third -L disables
-printing of the LDIF version.
-The default is -L.
+Search results are display in LDAP Data Interchange Format detailed in
+.BR ldif (5).
+A single -L restricts the output to LDIFv1.
+A second -L disables comments.
+A third -L disables printing of the LDIF version.
+The default is to use an extended version of LDIF.
 .TP
 .B \-M[M]
 Enable manage DSA IT control.
@@ -165,8 +167,7 @@ character, then the lines are read from standard input.
 Use simple authentication instead of SASL.
 .TP
 .BI \-D \ binddn
-Use \fIbinddn\fP to bind to the LDAP directory. \fIbinddn\fP should be
-a string-represented DN as defined in RFC 1779.
+Use the Distinguished Name \fIbinddn\fP to bind to the LDAP directory.
 .TP
 .B \-W
 Prompt for simple authentication.
@@ -263,20 +264,24 @@ Issue StartTLS (Transport Layer Security) extended operation. If you use
 .B \-ZZ\c
 , the command will require the operation to be successful.
 .SH OUTPUT FORMAT
-If one or more entries are found, each entry is written to standard output
-in the form:
+If one or more entries are found, each entry is written to standard
+output in LDAP Data Interchange Format or
+.BR ldif (5):
 .LP
 .nf
-    Distinguished Name (DN)
-    User Friendly Name (this line present only if the -u option is used)
-    attributename=value
-    attributename=value
-    attributename=value
+       version: 1
+
+       # bjensen, example, net
+       dn: uid=bjensen, dc=example, dc=net
+       objectClass: person
+       objectClass: dcObject
+       uid: bjensen
+       cn: Barbara Jensen
+       sn: Jensen
     ...
 .fi
 .LP
-Multiple entries are separated with a single blank line.  
-If the -t option is used, the name of a temporary file
+If the -t option is used, the URI of a temporary file
 is used in place of the actual value.  If the -A option
 is given, only the "attributename" part is written.
 .SH EXAMPLE
@@ -286,28 +291,30 @@ The following command:
     ldapsearch -LLL "(sn=smith)" cn sn telephoneNumber
 .fi
 .LP
-will perform a subtree search (using the default search base) for
-entries with a surname (sn) of smith.  The common name (cn), surname
+will perform a subtree search (using the default search base defined
+in
+.BR ldap.conf (5))
+for entries with a surname (sn) of smith.  The common name (cn), surname
 (sn) and telephoneNumber values will be retrieved and printed to
 standard output.
 The output might look something like this if two entries are found:
 .LP
 .nf
-dn: uid=jts, ou=Volunteers, ou=People, dc=OpenLDAP, dc=org
-cn: John Smith
-cn: John T. Smith
-sn: Smith
-sn;lang-en: Smith
-sn;lang-de: Schmidt
-telephoneNumber: 1 555 123-4567
+    dn: uid=jts, dc=example, dc=com
+       cn: John Smith
+       cn: John T. Smith
+       sn: Smith
+       sn;lang-en: Smith
+       sn;lang-de: Schmidt
+       telephoneNumber: 1 555 123-4567
 
-dn: uid=sss, ou=Staff, ou=People, dc=OpenLDAP, dc=org
-cn: Steve Smith
-cn: Steve S. Smith
-sn: Smith
-sn;lang-en: Smith
-sn;lang-de: Schmidt
-telephoneNumber: 1 555 765-4321
+       dn: uid=sss, dc=example, dc=com
+       cn: Steve Smith
+       cn: Steve S. Smith
+       sn: Smith
+       sn;lang-en: Smith
+       sn;lang-de: Schmidt
+       telephoneNumber: 1 555 765-4321
 .fi
 .LP
 The command:
@@ -324,10 +331,10 @@ output might look like this if one entry with one value for each of the
 requested attributes is found:
 .LP
 .nf
-dn: uid=xyz, ou=Staff, ou=People, dc=OpenLDAP, dc=org
-ufn: xyz, Staff, People, OpenLDAP, org
-audio:< file::/tmp/ldapsearch-audio-a19924
-jpegPhoto:< file::=/tmp/ldapsearch-jpegPhoto-a19924
+    dn: uid=xyz, dc=example, dc=com
+    ufn: xyz, example, com
+    audio:< file::/tmp/ldapsearch-audio-a19924
+    jpegPhoto:< file::=/tmp/ldapsearch-jpegPhoto-a19924
 .fi
 .LP
 This command:
@@ -337,58 +344,48 @@ This command:
 .fi
 .LP
 will perform a one-level search at the c=US level for all entries
-whose organizationName (o) begins begins with \fBUniversity\fP.
-The organizationName and description attribute values will be retrieved
+whose organization name (o) begins begins with \fBUniversity\fP.
+The organization name and description attribute values will be retrieved
 and printed to standard output, resulting in output similar to this:
 .LP
 .nf
-dn: o=University of Alaska Fairbanks, c=US
-o: University of Alaska Fairbanks
-description: Preparing Alaska for a brave new yesterday
-description: leaf node only
+    dn: o=University of Alaska Fairbanks, c=US
+    o: University of Alaska Fairbanks
+    description: Preparing Alaska for a brave new yesterday
+    description: leaf node only
 
-dn: o=University of Colorado at Boulder, c=US
-o: University of Colorado at Boulder
-description: No personnel information
-description: Institution of education and research
+    dn: o=University of Colorado at Boulder, c=US
+    o: University of Colorado at Boulder
+    description: No personnel information
+    description: Institution of education and research
 
-dn: o=University of Colorado at Denver, c=US
-o: University of Colorado at Denver
-o: UCD
-o: CU/Denver
-o: CU-Denver
-description: Institute for Higher Learning and Research
+    dn: o=University of Colorado at Denver, c=US
+    o: University of Colorado at Denver
+    o: UCD
+    o: CU/Denver
+    o: CU-Denver
+    description: Institute for Higher Learning and Research
 
-dn: o=University of Florida, c=US
-o: University of Florida
-o: UFl
-description: Warper of young minds
+    dn: o=University of Florida, c=US
+    o: University of Florida
+    o: UFl
+    description: Warper of young minds
 
-etc....
+    etc....
 .fi
 .SH DIAGNOSTICS
-Exit status is 0 if no errors occur.  Errors result in a non-zero exit
-status and a diagnostic message being written to standard error.
+Exit status is zero if no errors occur.
+Errors result in a non-zero exit status and
+a diagnostic message being written to standard error.
 .SH "SEE ALSO"
 .BR ldapadd (1),
 .BR ldapdelete (1),
 .BR ldapmodify (1),
 .BR ldapmodrdn (1),
 .BR ldap.conf (5),
+.BR ldif (5),
 .BR ldap (3),
 .BR ldap_search (3)
-.LP
-Kille, S.,
-.IR "A String Representation of Distinguished Names",
-.SM RFC
-1779,
-ISODE Consortium, March 1995.
-.LP
-Howes, T.,
-.IR "A String Representation of LDAP Search Filters",
-.SM RFC
-1558,
-University of Michigan, December 1993.
 .SH AUTHOR
 The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS

diff --git a/doc/man/man1/ud.1 b/doc/man/man1/ud.1
index 373c7a4724d8be04cb88f07210be309e7ddfacf5..9e39c46828c3d96e7992388c5ffd67a0f7ecb5c7 100644 (file)
--- a/doc/man/man1/ud.1
+++ b/doc/man/man1/ud.1
@@ -1,4 +1,4 @@
-.TH UD 1 "12 September 1999" "OpenLDAP LDVERSION"
+.TH UD 1 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 0ba36c568cdc57ea10218b8121b37725669d05b3..1c1723a79ef89a479a3b7cd210d9fb9b2a3fed61 100644 (file)
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -1,4 +1,4 @@
-.TH LDAP.CONF 5 "29 November 1998" "OpenLDAP LDVERSION"
+.TH LDAP.CONF 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/ldapfilter.conf.5 b/doc/man/man5/ldapfilter.conf.5
index 97d720dae9defff668f102709dbd1db6aa393688..6bf60c90798e77fe4b7bad750b54971ff10f5d92 100644 (file)
--- a/doc/man/man5/ldapfilter.conf.5
+++ b/doc/man/man5/ldapfilter.conf.5
@@ -1,4 +1,4 @@
-.TH LDAPFILTER.CONF 5 "22 September 1998" "OpenLDAP LDVERSION"
+.TH LDAPFILTER.CONF 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/ldapfriendly.5 b/doc/man/man5/ldapfriendly.5
index 3cf6f02edc8ba65f49aa27b48e05b083d405847a..f3e4ea0720717887df1886b6399d7da28b0e4e10 100644 (file)
--- a/doc/man/man5/ldapfriendly.5
+++ b/doc/man/man5/ldapfriendly.5
@@ -1,4 +1,4 @@
-.TH LDAPFRIENDLY 5 "22 September 1998" "OpenLDAP LDVERSION"
+.TH LDAPFRIENDLY 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/ldapsearchprefs.conf.5 b/doc/man/man5/ldapsearchprefs.conf.5
index a075148c78475b831e7753d5a63156e44de065b2..9bfdbfe1c0ee85c5c41ecc91cf6e3eb8142c598b 100644 (file)
--- a/doc/man/man5/ldapsearchprefs.conf.5
+++ b/doc/man/man5/ldapsearchprefs.conf.5
@@ -1,4 +1,4 @@
-.TH LDAPSEARCHPREFS.CONF 5 "22 September 1998" "OpenLDAP LDVERSION"
+.TH LDAPSEARCHPREFS.CONF 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/ldaptemplates.conf.5 b/doc/man/man5/ldaptemplates.conf.5
index e5a87b6c80adac755fb6c8a5e128ed28c1a4c402..e587b7c95d83b844970a0b4db6d5dffc40784697 100644 (file)
--- a/doc/man/man5/ldaptemplates.conf.5
+++ b/doc/man/man5/ldaptemplates.conf.5
@@ -1,4 +1,4 @@
-.TH LDAPTEMPLATES.CONF 5 "22 September 1998" "OpenLDAP LDVERSION"
+.TH LDAPTEMPLATES.CONF 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5
index 9ab351768e8174db0d614dd1a634ec09bb2962d5..a96b888ce47e2ce1493737c973c6d143b57b1b19 100644 (file)
--- a/doc/man/man5/ldif.5
+++ b/doc/man/man5/ldif.5
@@ -1,4 +1,4 @@
-.TH LDIF 5 "22 September 1998" "OpenLDAP LDVERSION"
+.TH LDIF 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 7aa76f764e6aad7c16fea5b8db7f9ceabbf81b43..d07ac8ecca84d63717f3251c160b8af96b892079 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -1,4 +1,4 @@
-.TH SLAPD.CONF 5 "13 August 2000" "OpenLDAP LDVERSION"
+.TH SLAPD.CONF 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
@@ -70,7 +70,13 @@ actual text are shown in brackets <>.
 Grant access (specified by <access>) to a set of entries and/or
 attributes (specified by <what>) by one or more requestors (specified
 by <who>).
-See Developer's FAQ (http://www.openldap.org/faq/) for details.
+See the "OpenLDAP's Administrator's Guide" for details.
+.TP
+.B argsfile <filename>
+The ( absolute ) name of a file that will hold the 
+.B slapd
+server's command line options
+if started without the debugging command line option.
 .HP
 .hy 0
 .B attributetype (\ <oid> [NAME\ <name>] [OBSOLETE]\
@@ -128,19 +134,6 @@ feature.  The default is 0.
 Read additional configuration information from the given file before
 continuing with the next line of the current file.
 .TP
-.B pidfile <filename>
-The ( absolute ) name of a file that will hold the 
-.B slapd
-server's process ID ( see
-.BR getpid (2)
-) if started without the debugging command line option.
-.TP
-.B argsfile <filename>
-The ( absolute ) name of a file that will hold the 
-.B slapd
-server's command line options
-if started without the debugging command line option.
-.TP
 .B loglevel <integer>
 Specify the level at which debugging statements and operation 
 statistics should be syslogged (currently logged to the
@@ -209,12 +202,39 @@ in place of the numeric OID in objectclass and attribute definitions. The
 name can also be used with a suffix of the form ":xx" in which case the
 value "oid.xx" will be used.
 .TP
+.B pidfile <filename>
+The ( absolute ) name of a file that will hold the 
+.B slapd
+server's process ID ( see
+.BR getpid (2)
+) if started without the debugging command line option.
+.TP
+.B password-hash <hash>
+The <hash> to use for userPassword generation.  One of
+.BR {SSHA} ,
+.BR {SHA} ,
+.BR {SMD5} ,
+.BR {MD5} ,
+.BR {CRYPT} ,
+.BR {KERBEROS} ,
+.BR {SASL} ,
+and
+.BR {UNIX} .
+The default is
+.BR {SSHA} .
+.TP
 .B referral <url>
 Specify the referral to pass back when
 .BR slapd (8)
 cannot find a local database to handle a request.
 If specified multiple times, each url is provided.
 .TP
+.B sasl-realm <string>
+Used to specify Cyrus SASL realm.
+.TP
+.B sasl-secprops <string>
+Used to specify Cyrus SASL security properties.
+.TP
 .B schemacheck { on | off }
 Turn schema checking on or off. The default is on.
 .TP
@@ -324,17 +344,22 @@ See
 for more information.
 .TP
 .B rootdn <dn>
-Specify the DN of an entry that is not subject to access control 
+Specify the distinguished name that is not subject to access control 
 or administrative limit restrictions for operations on this database.
+This DN may or may not be associated with an entry.  An empty root
+DN, the default, specifies no root access is to be granted.
 .TP
 .B rootpw <password>
 Specify a password (or hash of the password) for the rootdn.
 This option accepts all RFC 2307 userPassword formats known to
-the server including \fB{SSHA}\fP, \fB{SHA}\fP, \fB{SMD5}\fP,
-\fB{MD5}\fP, \fB{CRYPT}\fP, and cleartext schemes.
+the server (see 
+.B password-hash
+desription) as well as cleartext.
 .BR slappasswd (8) 
 may be used to generate a hash of a password.  Cleartext
-and \fB{CRYPT}\fP passwords are not recommended.
+and \fB{CRYPT}\fP passwords are not recommended.  The default
+is empty imply authentication of the root DN is by other means
+(e.g. SASL).  Use of SASL is encouraged.
 .TP
 .B suffix <dn suffix>
 Specify the DN suffix of queries that will be passed to this 

diff --git a/doc/man/man5/slapd.replog.5 b/doc/man/man5/slapd.replog.5
index 3f600f27b3c021c5c2838dd05067dbf1286e6fb6..1fe1c0105cdb35beb687742da5b0019f787178d9 100644 (file)
--- a/doc/man/man5/slapd.replog.5
+++ b/doc/man/man5/slapd.replog.5
@@ -1,4 +1,4 @@
-.TH SLAPD.REPLOG 5 "22 September 1998" "OpenLDAP LDVERSION"
+.TH SLAPD.REPLOG 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man5/ud.conf.5 b/doc/man/man5/ud.conf.5
index f9610f833580fb771a7629d5b41462fe113157e6..65b0a3beae056144e036831d92621f2f8e98ac59 100644 (file)
--- a/doc/man/man5/ud.conf.5
+++ b/doc/man/man5/ud.conf.5
@@ -1,4 +1,4 @@
-.TH UD.CONF 5 "22 September 1998" "OpenLDAP LDVERSION"
+.TH UD.CONF 5 "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/go500.8 b/doc/man/man8/go500.8
index d7c2a8cb035eabb6821c643d96d4d53725ae3953..1ed2ef07e3bd6d6644f6fe00b4f160c8048e2925 100644 (file)
--- a/doc/man/man8/go500.8
+++ b/doc/man/man8/go500.8
@@ -1,4 +1,4 @@
-.TH GO500 8C "22 September 1998" "OpenLDAP LDVERSION"
+.TH GO500 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/go500gw.8 b/doc/man/man8/go500gw.8
index 066fec91af7be0131165a0420defeba0adad1dea..98918220df009c3121ac6510dfbe5fe058b695da 100644 (file)
--- a/doc/man/man8/go500gw.8
+++ b/doc/man/man8/go500gw.8
@@ -1,4 +1,4 @@
-.TH GO500GW 8C "22 September 1998" "OpenLDAP LDVERSION"
+.TH GO500GW 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/in.xfingerd.8 b/doc/man/man8/in.xfingerd.8
index 0baa476b9471104533d3e01616299ddbb877a721..187e7226c1de9e7914862131893254e061bf4e15 100644 (file)
--- a/doc/man/man8/in.xfingerd.8
+++ b/doc/man/man8/in.xfingerd.8
@@ -1,4 +1,4 @@
-.TH IN.XFINGERD 8C "16 August 200" "OpenLDAP LDVERSION"
+.TH IN.XFINGERD 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/mail500.8 b/doc/man/man8/mail500.8
index cc40891ead867c03a16ee22f5373d563ed9b1381..02ca1026025e1c08e82e634e5c5fe79437f864c6 100644 (file)
--- a/doc/man/man8/mail500.8
+++ b/doc/man/man8/mail500.8
@@ -1,4 +1,4 @@
-.TH MAIL500 8C "22 September 1998" "OpenLDAP LDVERSION"
+.TH MAIL500 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/rcpt500.8 b/doc/man/man8/rcpt500.8
index 6003dee210d93ad9a2127bb235381aaa14e114b7..0539664b8adaea23dae2b2bcebde592f19027d5b 100644 (file)
--- a/doc/man/man8/rcpt500.8
+++ b/doc/man/man8/rcpt500.8
@@ -1,4 +1,4 @@
-.TH RCPT500 8C "22 September 1998" "OpenLDAP LDVERSION"
+.TH RCPT500 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index 9359ab0d9f892ecb023034393fc7967db1e57daf..1709f789a29c5ed6677ec3df8cfecec722cf2563 100644 (file)
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -1,4 +1,4 @@
-.TH SLAPADD 8C "13 August 2000" "OpenLDAP LDVERSION"
+.TH SLAPADD 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/slapcat.8 b/doc/man/man8/slapcat.8
index 49499a68acb11e4d2efc831c1bb142e6cc8abeb0..c682383c5e57553251e9c20a0216f4bbee7a53b0 100644 (file)
--- a/doc/man/man8/slapcat.8
+++ b/doc/man/man8/slapcat.8
@@ -1,4 +1,4 @@
-.TH SLAPCAT 8C "13 August 2000" "OpenLDAP LDVERSION"
+.TH SLAPCAT 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index fef489185ab019e505d21a41aee103d64dbf0580..503bdf11aff3e1c85dc444664f2a2c9b94594768 100644 (file)
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -1,4 +1,4 @@
-.TH SLAPD 8C "13 August 2000" "OpenLDAP LDVERSION"
+.TH SLAPD 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/slapindex.8 b/doc/man/man8/slapindex.8
index 32334bf845c49a0da8d4282db0e3fcf7e367e3d3..0d864fd15eb3b80f380a984bf9ad6495e7d55aff 100644 (file)
--- a/doc/man/man8/slapindex.8
+++ b/doc/man/man8/slapindex.8
@@ -1,4 +1,4 @@
-.TH SLAPINDEX 8C "13 August 2000" "OpenLDAP LDVERSION"
+.TH SLAPINDEX 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8
index bfe842d683da48e7acfb275d99283dcdce55f4b8..9584a9f34c48bbe1b980c7c03c71e4df7266ffc6 100644 (file)
--- a/doc/man/man8/slappasswd.8
+++ b/doc/man/man8/slappasswd.8
@@ -1,4 +1,4 @@
-.TH SLAPPASSWD 8C "13 August 2000" "OpenLDAP LDVERSION"
+.TH SLAPPASSWD 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.

diff --git a/doc/man/man8/slurpd.8 b/doc/man/man8/slurpd.8
index b4fd42a153e3fb3684e06f6eacd4737c56a56534..5b30dedf63a9e9ff2442c53c09568f23b7c8da7e 100644 (file)
--- a/doc/man/man8/slurpd.8
+++ b/doc/man/man8/slurpd.8
@@ -1,4 +1,4 @@
-.TH SLURPD 8C "13 August 2000" "OpenLDAP LDVERSION"
+.TH SLURPD 8C "20 August 2000" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.