rootpw changes from HEAD

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 9a22026da77d5778075ade89b820cb4fceac56e0..0d41ed4beab20c5f131ccd9d8a522a7d477c6dbc 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -914,9 +914,9 @@ may also be provided using the
 directive.
 .TP
 .B rootpw <password>
-Specify a password (or hash of the password) for the rootdn.  If
-the rootdn is not within the namingContext of the database, the
-provided password is ignored.
+Specify a password (or hash of the password) for the rootdn.  The
+password can only be set if the rootdn is within the namingContext
+(suffix) of the database.
 This option accepts all RFC 2307 userPassword formats known to
 the server (see 
 .B password-hash

diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index 5bf85b1a8e9c27f8b071c40836a6d5cca19c5506..69256c39fd676717b1927d80a9a90b92bef3739d 100644 (file)
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -20,7 +20,6 @@ suffix                "ou=Information Technology Division,ou=People,o=University of Michigan,
 subordinate
 directory      ./test-db/C_db1
 rootdn         "cn=Manager, o=University of Michigan, c=US"
-rootpw         secret
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
@@ -35,7 +34,6 @@ suffix                "ou=Groups,o=University of Michigan, c=US"
 subordinate
 directory      ./test-db/C_db2
 rootdn         "cn=Manager, o=University of Michigan, c=US"
-rootpw         secret
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany