From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 10 Jun 2010 19:17:52 +0000 (+0000)
Subject: ITS#6546
X-Git-Tag: OPENLDAP_REL_ENG_2_4_23~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d99f50fd3d9c586e551bbc638b2c2645e4dfdf3d;p=openldap

ITS#6546
---

diff --git a/CHANGES b/CHANGES
index 8398634b2d..b0c3a2e10d 100644
--- 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 5048a8a996..3a88a80d45 100644
--- 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