Misc cleanup

tests/data/slapd-acl.conf

@@ -20,7 +20,7 @@ access to * by * read
 #######################################################################
 
 database	@BACKEND@
-cachesize	0
+#ldbm#cachesize	0
 suffix		"o=University of Michigan,c=US"
 directory	./test-db
 rootdn		"cn=Manager,o=University of Michigan,c=US"
@@ -29,7 +29,6 @@ rootpw		secret
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
-lastmod		on
 
 #
 # normal installations should protect root dse,

tests/data/slapd-master.conf

@@ -16,9 +16,9 @@ argsfile    ./test-db/slapd.args
 #######################################################################
 
 database	@BACKEND@
-suffix		"o=University of Michigan, c=US"
+suffix		"o=University of Michigan,c=US"
 directory	./test-db
-rootdn		"cn=Manager, o=University of Michigan, c=US"
+rootdn		"cn=Manager,o=University of Michigan,c=US"
 rootpw		secret
 #ldbm#index		objectClass eq
 #bdb#index		objectClass eq

tests/data/slapd-nis-master.conf

@@ -38,4 +38,3 @@ index		ipHostNumber		pres,eq,approx
 index		ipNetworkNumber		pres,eq,approx
 index		ipProtocolNumber	pres,eq,approx
 index		default		none
-lastmod		on

tests/data/slapd-passwd.conf

@@ -16,7 +16,7 @@ argsfile    ./test-db/slapd.args
 #######################################################################
 
 database	passwd
-suffix		"o=University of Michigan, c=US"
-rootdn		"cn=Manager, o=University of Michigan, c=US"
+suffix		"o=University of Michigan,c=US"
+rootdn		"cn=Manager,o=University of Michigan,c=US"
 rootpw		secret
 #file		./data/passwd

tests/data/slapd-pw.conf

@@ -18,14 +18,13 @@ argsfile    ./test-db/slapd.args
 #######################################################################
 
 database	@BACKEND@
-cachesize	0
+#ldbm#cachesize	0
 suffix		"o=University of Michigan, c=US"
 directory	./test-db
 rootdn		"cn=Manager, o=University of Michigan, c=US"
 rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
-lastmod		on
 
 #
 # normal installations should protect root dse,

tests/data/slapd-ref-slave.conf

@@ -21,12 +21,11 @@ referral	"ldap://localhost:9009/"
 
 database	@BACKEND@
 cachesize	0
-suffix		"o=University of Mich, c=US"
+suffix		"o=University of Mich,c=US"
 directory	./test-repl
-rootdn		"cn=Manager, o=University of Mich, c=US"
+rootdn		"cn=Manager,o=University of Mich,c=US"
 rootpw		secret
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
-lastmod		on

tests/data/slapd-repl-master.conf

@@ -18,20 +18,19 @@ argsfile    ./test-db/slapd.args
 #######################################################################
 
 database	@BACKEND@
-cachesize	0
-suffix		"o=University of Michigan, c=US"
+#ldbm#cachesize	0
+suffix		"o=University of Michigan,c=US"
 directory	./test-db
-rootdn		"cn=Manager, o=University of Michigan, c=US"
+rootdn		"cn=Manager,o=University of Michigan,c=US"
 rootpw		secret
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
-lastmod		on
 
 replogfile	./test-db/slapd.replog
 
 replica		host=localhost:9010
-		binddn="cn=Replica, o=University of Michigan, c=US"
+		binddn="cn=Replica,o=University of Michigan,c=US"
 		bindmethod=simple
 		credentials=secret

tests/data/slapd-repl-slave.conf

@@ -19,15 +19,14 @@ argsfile    ./test-repl/slapd.args
 #######################################################################
 
 database	@BACKEND@
-cachesize	0
-suffix		"o=University of Michigan, c=US"
+#ldbm#cachesize	0
+suffix		"o=University of Michigan,c=US"
 directory	./test-repl
-rootdn		"cn=Replica, o=University of Michigan, c=US"
+rootdn		"cn=Replica,o=University of Michigan,c=US"
 rootpw		secret
-updatedn	"cn=Replica, o=University of Michigan, c=US"
+updatedn	"cn=Replica,o=University of Michigan,c=US"
 updateref	"ldap://localhost:9009"
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
-lastmod		on

tests/data/slapd-repl-submaster.conf

@@ -18,21 +18,20 @@ argsfile    ./test-db/slapd.args
 #######################################################################
 
 database	@BACKEND@
-cachesize	0
-suffix		"o=University of Michigan, c=US"
+#ldbm#cachesize	0
+suffix		"o=University of Michigan,c=US"
 directory	./test-db
-rootdn		"cn=Manager, o=University of Michigan, c=US"
+rootdn		"cn=Manager,o=University of Michigan,c=US"
 rootpw		secret
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
-lastmod		on
 
 replogfile	./test-db/slapd.replog
 
 replica		host=localhost:9010
-		suffix="ou=Groups, o=University of Michigan, c=US"
-		binddn="cn=Replica, ou=Groups, o=University of Michigan, c=US"
+		suffix="ou=Groups,o=University of Michigan,c=US"
+		binddn="cn=Replica,ou=Groups,o=University of Michigan,c=US"
 		bindmethod=simple
 		credentials=secret

tests/data/slapd-repl-subslave.conf

@@ -19,15 +19,14 @@ argsfile    ./test-repl/slapd.args
 #######################################################################
 
 database	@BACKEND@
-cachesize	0
+#ldbm#cachesize	0
 suffix		"ou=Groups, o=University of Michigan, c=US"
 directory	./test-repl
-rootdn		"cn=Replica, ou=Groups, o=University of Michigan, c=US"
+rootdn		"cn=Replica,ou=Groups,o=University of Michigan,c=US"
 rootpw		secret
-updatedn	"cn=Replica, ou=Groups, o=University of Michigan, c=US"
+updatedn	"cn=Replica,ou=Groups,o=University of Michigan,c=US"
 updateref	"ldap://localhost:9009"
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
-lastmod		on

tests/data/slapd-schema.conf

@@ -16,6 +16,8 @@ include ./schema/misc.schema
 include ./schema/nis.schema
 include ./schema/openldap.schema
 #
+include ./schema/collective.schema
+#
 schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args