ITS#6546

diff --git a/CHANGES b/CHANGES
index 8398634b2d2f9c0526ef3fca4df0888865ef2b5d..b0c3a2e10d3f043bba0a7664e6b7a00a5fcdc415 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.23 Engineering
        Fixed slapd syncrepl rid logging (ITS#6533)
        Fixed contrib/nssov network.c missing patch (ITS#6562)
+       Documentation
+               slapd-config(5) note default rootdn (ITS#6546)
 
 OpenLDAP 2.4.22 Release (2010/04/24)
        Added slapd SLAP_SCHEMA_EXPOSE flag for hidden schema elements (ITS#6435)

diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 5048a8a9968d8530cfef1c50e8a1d3473b4a28bd..3a88a80d455061478b76a827f3fa09c485021878 100644 (file)
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -1552,6 +1552,13 @@ a namingContext (suffix) of the database, a simple bind password
 may also be provided using the
 .B olcRootPW
 directive. Note that the rootdn is always needed when using syncrepl.
+The
+.B olcRootDN
+of the
+.B cn=config
+database defaults to
+.B cn=config
+itself.
 .TP
 .B olcRootPW: <password>
 Specify a password (or hash of the password) for the rootdn.  The