From 70382ac66af606edb17f7ead5bf8727bc2ad33bf Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 14 Jan 2002 03:42:24 +0000 Subject: [PATCH] Misc cleanup --- tests/data/slapd-acl.conf | 3 +-- tests/data/slapd-master.conf | 4 ++-- tests/data/slapd-nis-master.conf | 1 - tests/data/slapd-passwd.conf | 4 ++-- tests/data/slapd-pw.conf | 3 +-- tests/data/slapd-ref-slave.conf | 5 ++--- tests/data/slapd-repl-master.conf | 9 ++++----- tests/data/slapd-repl-slave.conf | 9 ++++----- tests/data/slapd-repl-submaster.conf | 11 +++++------ tests/data/slapd-repl-subslave.conf | 7 +++---- tests/data/slapd-schema.conf | 2 ++ 11 files changed, 26 insertions(+), 32 deletions(-) diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index 686c9d54b7..f361b2382f 100644 --- 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 2bc67b4071..4dc1009791 100644 --- 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 bd5fe326f3..a0869d3275 100644 --- 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 cfb52a7aa3..4af2458c94 100644 --- 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 1faa185bd8..8d3f2d9a04 100644 --- 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 9995fa0aec..e6c3e667a3 100644 --- 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 727036e2ed..7238b42f6b 100644 --- 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 29319fb340..a38457f49e 100644 --- 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 4a0075b088..426dc49ab3 100644 --- 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 4a73edba09..1a094fe060 100644 --- 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 3bc338e167..c4c8773e46 100644 --- 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 -- 2.39.2