From aa411f1bd12a0cdedfb171f67cd0605ee65c906a Mon Sep 17 00:00:00 2001 From: Gavin Henry Date: Thu, 14 Jun 2007 22:29:29 +0000 Subject: [PATCH] Removed all references to ldbm from test data and man pages. Only slapd-ldbm.5 left. --- doc/man/man5/slapd.conf.5 | 1 - doc/man/man5/slapo-syncprov.5 | 3 -- tests/data/slapd-aci.conf | 4 +-- tests/data/slapd-acl.conf | 6 ++-- tests/data/slapd-cache-master.conf | 4 +-- tests/data/slapd-chain1.conf | 6 ++-- tests/data/slapd-chain2.conf | 6 ++-- tests/data/slapd-component.conf | 2 +- tests/data/slapd-config-undo.conf | 4 +-- tests/data/slapd-dds.conf | 6 ++-- tests/data/slapd-deltasync-master.conf | 8 ++--- tests/data/slapd-deltasync-slave.conf | 4 +-- tests/data/slapd-dn.conf | 4 +-- tests/data/slapd-dynlist.conf | 4 +-- tests/data/slapd-emptydn.conf | 8 ++--- tests/data/slapd-glue-syncrepl1.conf | 30 +++++++++---------- tests/data/slapd-glue-syncrepl2.conf | 30 +++++++++---------- tests/data/slapd-glue.conf | 30 +++++++++---------- tests/data/slapd-idassert.conf | 12 ++++---- tests/data/slapd-ldapglue.conf | 4 +-- tests/data/slapd-ldapgluegroups.conf | 4 +-- tests/data/slapd-ldapgluepeople.conf | 4 +-- tests/data/slapd-limits.conf | 4 +-- tests/data/slapd-master.conf | 2 +- tests/data/slapd-meta2.conf | 2 +- tests/data/slapd-ppolicy.conf | 2 +- tests/data/slapd-proxycache.conf | 6 ++-- tests/data/slapd-pw.conf | 6 ++-- tests/data/slapd-ref-slave.conf | 6 ++-- tests/data/slapd-referrals.conf | 2 +- tests/data/slapd-refint.conf | 4 +-- tests/data/slapd-relay.conf | 2 +- tests/data/slapd-repl-slave-remote.conf | 2 +- tests/data/slapd-retcode.conf | 4 +-- tests/data/slapd-schema.conf | 2 +- tests/data/slapd-syncrepl-master.conf | 4 +-- tests/data/slapd-syncrepl-multiproxy.conf | 4 +-- tests/data/slapd-syncrepl-slave-persist1.conf | 4 +-- tests/data/slapd-syncrepl-slave-persist2.conf | 4 +-- tests/data/slapd-syncrepl-slave-persist3.conf | 4 +-- tests/data/slapd-syncrepl-slave-refresh1.conf | 6 ++-- tests/data/slapd-syncrepl-slave-refresh2.conf | 6 ++-- tests/data/slapd-translucent-local.conf | 4 +-- tests/data/slapd-translucent-remote.conf | 4 +-- tests/data/slapd-unique.conf | 4 +-- tests/data/slapd-valsort.conf | 4 +-- tests/data/slapd-whoami.conf | 6 ++-- tests/data/slapd.conf | 4 +-- 48 files changed, 141 insertions(+), 145 deletions(-) diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index cc9703f740..66d4c1f134 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -1052,7 +1052,6 @@ should be one of .BR dnssrv , .BR hdb , .BR ldap , -.BR ldbm , .BR ldif , .BR meta , .BR monitor , diff --git a/doc/man/man5/slapo-syncprov.5 b/doc/man/man5/slapo-syncprov.5 index 1b3059c3eb..06812c6fef 100644 --- a/doc/man/man5/slapo-syncprov.5 +++ b/doc/man/man5/slapo-syncprov.5 @@ -21,9 +21,6 @@ memory on startup, and maintained in memory thereafter. Checkpoints may be configured to write the contextCSN into the underlying database to minimize recovery time after an unclean shutdown. -Note that due to deadlock constraints in the LDBM database, this overlay -will only work in RefreshOnly mode, and cannot perform checkpoints, on LDBM. - On databases that support inequality indexing, it is helpful to set an eq index on the entryCSN attribute when using this overlay. .SH CONFIGURATION diff --git a/tests/data/slapd-aci.conf b/tests/data/slapd-aci.conf index 54e43851b4..3f5d215a71 100644 --- a/tests/data/slapd-aci.conf +++ b/tests/data/slapd-aci.conf @@ -50,8 +50,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + access to dn.subtree="dc=example,dc=com" by dynacl/aci write diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index 183ce16b1e..96201284bb 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -42,7 +42,7 @@ access to * ####################################################################### database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=com" directory @TESTDIR@/db.1.a rootdn "cn=Manager,dc=example,dc=com" @@ -51,8 +51,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #access to attrs=objectclass dn.subtree="dc=example,dc=com" access to attrs=objectclass diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf index 724acca1e7..e49b1e136f 100644 --- a/tests/data/slapd-cache-master.conf +++ b/tests/data/slapd-cache-master.conf @@ -41,7 +41,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf index 731a6e6ab9..401058729b 100644 --- a/tests/data/slapd-chain1.conf +++ b/tests/data/slapd-chain1.conf @@ -50,7 +50,7 @@ chain-idassert-bind bindmethod=simple # database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=com" directory @TESTDIR@/db.1.a rootdn "cn=Manager,dc=example,dc=com" @@ -59,7 +59,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf index b4fc03228a..206bb1f705 100644 --- a/tests/data/slapd-chain2.conf +++ b/tests/data/slapd-chain2.conf @@ -39,7 +39,7 @@ argsfile @TESTDIR@/slapd.2.args # database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=com" directory @TESTDIR@/db.2.a rootdn "cn=Manager,dc=example,dc=com" @@ -48,8 +48,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + # # uses the chain overlay as database specific; diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf index 8c191a5361..823934356a 100644 --- a/tests/data/slapd-component.conf +++ b/tests/data/slapd-component.conf @@ -44,6 +44,6 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #bdb#index objectClass eq #hdb#index objectClass eq -#ldbm#index objectClass eq + #monitor#database monitor diff --git a/tests/data/slapd-config-undo.conf b/tests/data/slapd-config-undo.conf index d4ff1eaa0a..14a9d8efb5 100644 --- a/tests/data/slapd-config-undo.conf +++ b/tests/data/slapd-config-undo.conf @@ -14,8 +14,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-dds.conf b/tests/data/slapd-dds.conf index 3fe61a889a..fe6baa4337 100644 --- a/tests/data/slapd-dds.conf +++ b/tests/data/slapd-dds.conf @@ -46,9 +46,9 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryExpireTimestamp eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub -#ldbm#index entryExpireTimestamp eq + + + overlay dds dds-max-ttl 1d diff --git a/tests/data/slapd-deltasync-master.conf b/tests/data/slapd-deltasync-master.conf index 23c0c48460..5d97366e1d 100644 --- a/tests/data/slapd-deltasync-master.conf +++ b/tests/data/slapd-deltasync-master.conf @@ -44,8 +44,8 @@ rootdn "cn=Manager,dc=example,dc=com" #bdb#index entryUUID,entryCSN eq #hdb#index objectClass eq #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index entryUUID,entryCSN eq + + overlay syncprov syncprov-reloadhint true @@ -63,8 +63,8 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + access to * by users write by * read diff --git a/tests/data/slapd-deltasync-slave.conf b/tests/data/slapd-deltasync-slave.conf index 8f363f118f..41ac4ce7c8 100644 --- a/tests/data/slapd-deltasync-slave.conf +++ b/tests/data/slapd-deltasync-slave.conf @@ -52,8 +52,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + # Don't change syncrepl spec yet syncrepl rid=1 diff --git a/tests/data/slapd-dn.conf b/tests/data/slapd-dn.conf index 81a387c939..270c61398a 100644 --- a/tests/data/slapd-dn.conf +++ b/tests/data/slapd-dn.conf @@ -42,7 +42,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-dynlist.conf b/tests/data/slapd-dynlist.conf index 1584074eeb..bf9a370553 100644 --- a/tests/data/slapd-dynlist.conf +++ b/tests/data/slapd-dynlist.conf @@ -46,8 +46,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay dynlist ### DO NOT ADD ANY DIRECTIVE BELOW THIS; TEST APPENDS STUFF ### diff --git a/tests/data/slapd-emptydn.conf b/tests/data/slapd-emptydn.conf index 5ee7b7917d..5d84d61920 100644 --- a/tests/data/slapd-emptydn.conf +++ b/tests/data/slapd-emptydn.conf @@ -47,8 +47,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + access to attrs=userPassword by dn.exact="cn=Manager,c=US" write @@ -72,8 +72,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + access to attrs=userPassword by self =wx diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf index 6748d8b6c1..ffd55b8822 100644 --- a/tests/data/slapd-glue-syncrepl1.conf +++ b/tests/data/slapd-glue-syncrepl1.conf @@ -45,11 +45,11 @@ rootdn "cn=Manager 1,dc=example,dc=com" #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany #hdb#index entryUUID,entryCSN pres -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + overlay syncprov database @BACKEND@ @@ -65,11 +65,11 @@ rootdn "cn=Manager 1,dc=example,dc=com" #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany #hdb#index entryUUID,entryCSN pres -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + syncrepl rid=1 provider=@URI2@ binddn="cn=Manager 2,dc=example,dc=com" @@ -97,11 +97,11 @@ rootpw secret #hdb#index objectclass eq #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + #overlay syncprov #monitor#database monitor diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf index e84ac49add..a588bb37ac 100644 --- a/tests/data/slapd-glue-syncrepl2.conf +++ b/tests/data/slapd-glue-syncrepl2.conf @@ -45,11 +45,11 @@ rootdn "cn=Manager 2,dc=example,dc=com" #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany #hdb#index entryUUID,entryCSN pres -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + syncrepl rid=2 provider=@URI1@ binddn="cn=Manager 1,dc=example,dc=com" @@ -78,11 +78,11 @@ rootdn "cn=Manager 2,dc=example,dc=com" #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany #hdb#index entryUUID,entryCSN pres -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + overlay syncprov @@ -97,11 +97,11 @@ rootpw secret #hdb#index objectclass eq #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + #overlay syncprov #monitor#database monitor diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf index 9cac035bea..71316628f2 100644 --- a/tests/data/slapd-glue.conf +++ b/tests/data/slapd-glue.conf @@ -42,11 +42,11 @@ rootdn "cn=Manager, dc=example,dc=com" #hdb#index objectclass eq #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + database @BACKEND@ suffix "ou=Groups,dc=example,dc=com" @@ -59,11 +59,11 @@ rootdn "cn=Manager, dc=example,dc=com" #hdb#index objectclass eq #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + database @BACKEND@ suffix "dc=example,dc=com" @@ -76,10 +76,10 @@ rootpw secret #hdb#index objectclass eq #hdb#index uid pres,eq,sub #hdb#index cn,sn pres,eq,sub,subany -#ldbm#index objectclass eq -#ldbm#index uid pres,eq,sub -#ldbm#index cn,sn pres,eq,sub,subany -#ldbm#dbnosync -#ldbm#dbnolocking + + + + + #monitor#database monitor diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf index 101e053ddf..36b08b6efd 100644 --- a/tests/data/slapd-idassert.conf +++ b/tests/data/slapd-idassert.conf @@ -58,7 +58,7 @@ access to * by * search database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=com" directory @TESTDIR@/db.1.a rootdn "cn=Manager,dc=example,dc=com" @@ -67,8 +67,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + access to dn.exact="cn=Proxy,ou=Admin,dc=example,dc=com" attrs=authzTo @@ -76,7 +76,7 @@ access to dn.exact="cn=Proxy,ou=Admin,dc=example,dc=com" by * =x database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=it" directory @TESTDIR@/db.2.a rootdn "cn=Manager,dc=example,dc=it" @@ -85,8 +85,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + database ldap suffix "o=Example,c=US" diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf index 2ec9f7b89f..c590333e8f 100644 --- a/tests/data/slapd-ldapglue.conf +++ b/tests/data/slapd-ldapglue.conf @@ -76,7 +76,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf index 5df507614b..240a44ffef 100644 --- a/tests/data/slapd-ldapgluegroups.conf +++ b/tests/data/slapd-ldapgluegroups.conf @@ -58,7 +58,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf index bd9d199f11..5e2911498c 100644 --- a/tests/data/slapd-ldapgluepeople.conf +++ b/tests/data/slapd-ldapgluepeople.conf @@ -59,7 +59,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf index cdf8dddf61..732b1666e2 100644 --- a/tests/data/slapd-limits.conf +++ b/tests/data/slapd-limits.conf @@ -41,8 +41,8 @@ rootpw secret #bdb#index uid eq #hdb#index objectClass eq #hdb#index uid eq -#ldbm#index objectClass eq -#ldbm#index uid eq + + # Need extra limits for pagedResults on backends that support it... #bdb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf index 300e64eeb3..5453c74d54 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-master.conf @@ -41,6 +41,6 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #bdb#index objectClass eq #hdb#index objectClass eq -#ldbm#index objectClass eq + #monitor#database monitor diff --git a/tests/data/slapd-meta2.conf b/tests/data/slapd-meta2.conf index 45bd83da31..d6e6ec8407 100644 --- a/tests/data/slapd-meta2.conf +++ b/tests/data/slapd-meta2.conf @@ -48,6 +48,6 @@ rootdn "cn=Manager,ou=Meta,dc=example,dc=com" rootpw secret #bdb#index objectClass eq #hdb#index objectClass eq -#ldbm#index objectClass eq + #monitor#database monitor diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf index 5f6aab942c..83d16762f2 100644 --- a/tests/data/slapd-ppolicy.conf +++ b/tests/data/slapd-ppolicy.conf @@ -40,7 +40,7 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #bdb#index objectClass eq #hdb#index objectClass eq -#ldbm#index objectClass eq + overlay ppolicy ppolicy_default "cn=Standard Policy,ou=Policies,dc=example,dc=com" ppolicy_use_lockout diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf index ceafcfc585..8645cbe139 100644 --- a/tests/data/slapd-proxycache.conf +++ b/tests/data/slapd-proxycache.conf @@ -52,13 +52,13 @@ proxytemplate (mail=) 0 @CACHETTL@ #bdb#cachesize 20 #hdb#cachesize 20 -#ldbm#cachesize 20 + directory @TESTDIR@/db.2.a #bdb#index objectClass eq #bdb#index cn,sn,uid,mail pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid,mail pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid,mail pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf index 3b3d28605f..5435a85147 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -32,7 +32,7 @@ argsfile @TESTDIR@/slapd.1.args ####################################################################### database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=com" directory @TESTDIR@/db.1.a rootdn "cn=Manager,dc=example,dc=com" @@ -41,8 +41,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + # # normal installations should protect root dse, diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf index 86a96ba9f2..cb41c812dc 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-slave.conf @@ -37,7 +37,7 @@ referral "@URI1@" database @BACKEND@ #bdb#cachesize 0 #hdb#cachesize 0 -#ldbm#cachesize 0 + suffix "o=University of Mich,c=US" directory @TESTDIR@/db.2.a rootdn "cn=Manager,o=University of Mich,c=US" @@ -46,7 +46,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf index 83b010115a..62c52179c6 100644 --- a/tests/data/slapd-referrals.conf +++ b/tests/data/slapd-referrals.conf @@ -38,6 +38,6 @@ rootdn "cn=Manager,c=us" rootpw secret #bdb#index objectClass eq #hdb#index objectClass eq -#ldbm#index objectClass eq + #monitor#database monitor diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf index be919c529e..515d0427a3 100644 --- a/tests/data/slapd-refint.conf +++ b/tests/data/slapd-refint.conf @@ -43,8 +43,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay refint refint_attributes manager secretary member diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf index a4375def3c..477cfe3e14 100644 --- a/tests/data/slapd-relay.conf +++ b/tests/data/slapd-relay.conf @@ -46,7 +46,7 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #bdb#index objectClass eq #hdb#index objectClass eq -#ldbm#index objectClass eq + database @RELAY@ suffix "o=Example,c=US" diff --git a/tests/data/slapd-repl-slave-remote.conf b/tests/data/slapd-repl-slave-remote.conf index 7283861954..00642ef3ef 100644 --- a/tests/data/slapd-repl-slave-remote.conf +++ b/tests/data/slapd-repl-slave-remote.conf @@ -48,7 +48,7 @@ access to * by * read database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=com" directory @TESTDIR@/db.2.a rootdn "cn=Replica,dc=example,dc=com" diff --git a/tests/data/slapd-retcode.conf b/tests/data/slapd-retcode.conf index a9984009ce..0ff7c1fe8d 100644 --- a/tests/data/slapd-retcode.conf +++ b/tests/data/slapd-retcode.conf @@ -44,8 +44,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay retcode retcode-parent "ou=RetCodes,dc=example,dc=com" diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf index 341ea1910b..c83985c13d 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -50,7 +50,7 @@ suffix "o=OpenLDAP Project,l=Internet" directory @TESTDIR@/db.1.a #bdb#index objectClass eq #hdb#index objectClass eq -#ldbm#index objectClass eq + #database @BACKEND@ #suffix "dc=example,dc=com" diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf index c2a34ef617..87494b58ea 100644 --- a/tests/data/slapd-syncrepl-master.conf +++ b/tests/data/slapd-syncrepl-master.conf @@ -45,8 +45,8 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay syncprov #syncprov-sessionlog 100 diff --git a/tests/data/slapd-syncrepl-multiproxy.conf b/tests/data/slapd-syncrepl-multiproxy.conf index d0b1486d2a..3f56d07070 100644 --- a/tests/data/slapd-syncrepl-multiproxy.conf +++ b/tests/data/slapd-syncrepl-multiproxy.conf @@ -46,8 +46,8 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay syncprov syncprov-sessionlog 100 diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf index 5e6ac0590c..402a5df9a5 100644 --- a/tests/data/slapd-syncrepl-slave-persist1.conf +++ b/tests/data/slapd-syncrepl-slave-persist1.conf @@ -52,8 +52,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + # Don't change syncrepl spec yet syncrepl rid=1 diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf index 7cd0f9d6f7..639098f737 100644 --- a/tests/data/slapd-syncrepl-slave-persist2.conf +++ b/tests/data/slapd-syncrepl-slave-persist2.conf @@ -31,8 +31,8 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + # Don't change syncrepl spec yet syncrepl rid=1 diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf index 0aa3688551..a85c0dec4b 100644 --- a/tests/data/slapd-syncrepl-slave-persist3.conf +++ b/tests/data/slapd-syncrepl-slave-persist3.conf @@ -43,8 +43,8 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + # Don't change syncrepl spec yet syncrepl rid=1 diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf index 3be2b74ea4..4e83b6175e 100644 --- a/tests/data/slapd-syncrepl-slave-refresh1.conf +++ b/tests/data/slapd-syncrepl-slave-refresh1.conf @@ -45,9 +45,9 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub -#ldbm#index entryUUID eq + + + # Don't change syncrepl spec yet syncrepl rid=1 diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf index a5edc4f0bd..fe069a6bdc 100644 --- a/tests/data/slapd-syncrepl-slave-refresh2.conf +++ b/tests/data/slapd-syncrepl-slave-refresh2.conf @@ -43,9 +43,9 @@ rootpw secret #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub #hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub -#ldbm#index entryUUID eq + + + # Don't change syncrepl spec yet syncrepl rid=1 diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf index 57737513bf..57e03e60d7 100644 --- a/tests/data/slapd-translucent-local.conf +++ b/tests/data/slapd-translucent-local.conf @@ -48,8 +48,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay translucent translucent_no_glue diff --git a/tests/data/slapd-translucent-remote.conf b/tests/data/slapd-translucent-remote.conf index f331d05d92..a527b0e66f 100644 --- a/tests/data/slapd-translucent-remote.conf +++ b/tests/data/slapd-translucent-remote.conf @@ -44,6 +44,6 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + diff --git a/tests/data/slapd-unique.conf b/tests/data/slapd-unique.conf index 9e8b11d091..1780432df7 100644 --- a/tests/data/slapd-unique.conf +++ b/tests/data/slapd-unique.conf @@ -43,8 +43,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay unique diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf index 372a82a256..caba3a5a61 100644 --- a/tests/data/slapd-valsort.conf +++ b/tests/data/slapd-valsort.conf @@ -41,8 +41,8 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + overlay valsort valsort-attr sn ou=users,o=valsort alpha-ascend diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf index c269008052..d63dbf9467 100644 --- a/tests/data/slapd-whoami.conf +++ b/tests/data/slapd-whoami.conf @@ -52,7 +52,7 @@ access to * by * read database @BACKEND@ -#ldbm#cachesize 0 + suffix "dc=example,dc=com" directory @TESTDIR@/db.1.a rootdn "cn=Manager,dc=example,dc=com" @@ -61,7 +61,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf index b4e461fb60..2872c50247 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -45,7 +45,7 @@ rootpw secret #bdb#index cn,sn,uid pres,eq,sub #hdb#index objectClass eq #hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub + + #monitor#database monitor -- 2.39.5