Misc cleanup

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 686c9d54b7c8d1016e633f562ee75e0359b312b4..f361b2382f569cc120e5127a2ebe37d823640b67 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/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,

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 2bc67b4071e7d083dc2461fd46351311d5e93edb..4dc100979155e0f07ba5907db7d3132d7de2a480 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/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

diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf
index bd5fe326f388553e6e50b7e077f20dde384c5857..a0869d3275e5cc9fc9b818dc00510ab02aafd86f 100644 (file)
--- a/tests/data/slapd-nis-master.conf
+++ b/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

diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index cfb52a7aa3be575c46c0b73bcef996b1ccb506e7..4af2458c94cbb0a793eac63d1ee50b5d48f4b8fa 100644 (file)
--- a/tests/data/slapd-passwd.conf
+++ b/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

diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index 1faa185bd8427c42e2126974686d2e3b7bd07d78..8d3f2d9a045d128b993ad0dca302023c03f6327f 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/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,

diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index 9995fa0aeccef0995ff296fafe6df2fbfe7fcc4a..e6c3e667a333ba55883e1a2df4c6d7a4a159351b 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/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

diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index 727036e2ed33c00530e6b69e2f471a21a7476503..7238b42f6b3922493e87702e602fedaecbef6a6f 100644 (file)
--- a/tests/data/slapd-repl-master.conf
+++ b/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

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index 29319fb34066d8088dce56e56cf946df7c10bff2..a38457f49ecb565ce5db8f990f9be7513e66b58f 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/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

diff --git a/tests/data/slapd-repl-submaster.conf b/tests/data/slapd-repl-submaster.conf
index 4a0075b08888ef7e1d25d21d20f4567f23b2c52a..426dc49ab31f9630d0b1021a8de20d06114a87b8 100644 (file)
--- a/tests/data/slapd-repl-submaster.conf
+++ b/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

diff --git a/tests/data/slapd-repl-subslave.conf b/tests/data/slapd-repl-subslave.conf
index 4a73edba09e132f52d020f45ffbd486644e65bb9..1a094fe060dd99385474d04b6dd5231b3b7522de 100644 (file)
--- a/tests/data/slapd-repl-subslave.conf
+++ b/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

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index 3bc338e1679ef6de409850db57148e8ae9ffe48d..c4c8773e46afb83054b73cdaf29f194874a3dab1 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/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