rootpw changes from HEAD

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

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