Removed all references to ldbm from test data and man pages. Only slapd-ldbm.5 left.

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index cc9703f7408fa44f1955ea994c7f7c4f117490dc..66d4c1f134f150fc1391229ac849000699ccb274 100644 (file)
--- 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 1b3059c3eb05c7db66ef2f154efd2b706be90d54..06812c6fef8f7e9b5fbacc5153aefee868607528 100644 (file)
--- 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 54e43851b468598eb97a2660d7f1c7c0585d8e5a..3f5d215a71fdbb6ef820bc3a3ee72e091db3392b 100644 (file)
--- 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 183ce16b1eb4c261ee03ebb99f2b9c01a397d2a7..96201284bb64f21759437a411983d813ec4dd6b3 100644 (file)
--- 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 724acca1e7000b3573406ff709a302da8b18e9a2..e49b1e136fbd2a2da716441db8064a13e049f872 100644 (file)
--- 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 731a6e6ab9b0c23d377b04609898499fe0a8c4e4..401058729bea09ad00cc9fbe0e3b0878f5805b5f 100644 (file)
--- 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 b4fc03228af255df958082b7bd277e2161b09194..206bb1f7053dac5ed644c07015e7990e4bcda168 100644 (file)
--- 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 8c191a53616ecb36ac677e414869eefd3f3482bb..823934356af59f6b2ac56d74a9c49d6482cf74dd 100644 (file)
--- 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 d4ff1eaa0a443f5af0f41e3cb41f51cf37c2d610..14a9d8efb5ed7784111103e370bb54ff72d5cddf 100644 (file)
--- 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 3fe61a889a2ddbe5a1c3b6884c8048ef03429d6b..fe6baa43370ffae05c3101b9f66d2bf92d89b076 100644 (file)
--- 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 23c0c4846042112e1682c88028234b57e868dbe8..5d97366e1dde3d2baeabc4effa9cc79d36ffa910 100644 (file)
--- 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 8f363f118f96809d47c2238fbdb6aefb7142632c..41ac4ce7c8322082f4a409323dd27d01605de0b6 100644 (file)
--- 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 81a387c9391c407ae6106ee3249286cc79a9edb6..270c61398a5c2475ff984d774104344ce3b0af5d 100644 (file)
--- 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 1584074eebd375201cbe08c0882805b26536f9d8..bf9a3705537c89c8d3247b303cb986873b2b3160 100644 (file)
--- 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 5ee7b7917d6083da9eee3df17a09cb0d32f11853..5d84d61920cf1f87130783caf8f8cf52945f247f 100644 (file)
--- 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 6748d8b6c1d7fda087ccb8f164090ccf0e525dee..ffd55b8822b59c8c20e79e27cead3a17e79bfea1 100644 (file)
--- 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 e84ac49add6d76e2d13e581964376926039aa8bf..a588bb37ac612964a3b6ef6438acf89582ea36bb 100644 (file)
--- 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 9cac035bea16037c5471c2d02488bd827ee74117..71316628f28d84bacb7bfd8c2e319605a53538bc 100644 (file)
--- 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 101e053ddf46ef417e6aac91e5905f4e9b94327a..36b08b6efde437d53f2f694c61395f40bf877b74 100644 (file)
--- 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 2ec9f7b89f8d13aa64ceafabbc8023f5ccf0813e..c590333e8f74b54289a5feb837fcf9e1beb2de03 100644 (file)
--- 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 5df507614b76443e8287d32185774e378351deaf..240a44ffef4b893f3753350a38db417ae1050437 100644 (file)
--- 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 bd9d199f112449df240ca1aa0c38c89f2e7d3ecb..5e2911498cd8dd9c0e25b24ee1939a43e0282f3c 100644 (file)
--- 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 cdf8dddf61e4d66fc873374e411846dcc9b6f7c4..732b1666e203bab3f4ab2274524a27b654454d32 100644 (file)
--- 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 300e64eeb3e8b9042b9c287c71284f75e9c3c9a2..5453c74d54ec4aebdbab9aff055a40d5bc0b3e5a 100644 (file)
--- 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 45bd83da31805d05e8cb96551a48a0c0bd559981..d6e6ec84071c0b38cbad05bb3adf3607e4fbb3d5 100644 (file)
--- 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 5f6aab942c3fe5d3b5cf3ecbf90be5758360442f..83d16762f210ec7cc8af9acaa3a57a0f56ece338 100644 (file)
--- 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 ceafcfc585d1b9ce3eee83af8fadcd7fdb07124d..8645cbe139312866dccb3d9a80ed5a530deaa517 100644 (file)
--- 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 3b3d28605f7b3359b46f240f937990d76a8cb9cd..5435a8514777595eac50b133367f0397f1b5d364 100644 (file)
--- 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 86a96ba9f2fa27c7876d3aaddc0ec87e9bf6242c..cb41c812dc3a099ea247dfb49a876049093f863f 100644 (file)
--- 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 83b010115a75bece2ff6368f927857013f9ae40e..62c52179c68dec1f2286bbc766b4360cb631429d 100644 (file)
--- 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 be919c529efb0d736840aa660c08ff95d49c0226..515d0427a3cf2dc2e389052b7471ad6152b5d0c8 100644 (file)
--- 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 a4375def3c6fdd69339499b972718e7612b0fce1..477cfe3e1427328145b33d93c588311aaa42e64e 100644 (file)
--- 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 72838619543e970c7cac455612d110df9f3818f2..00642ef3efb04764a59b41ba9573a028119cbb88 100644 (file)
--- 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 a9984009cee57e3454a52b3df214c0065e21bfb1..0ff7c1fe8d5e61aa8fefdb5db5bae61191f0a41c 100644 (file)
--- 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 341ea1910b488a052b6a58751302173d19b8ec04..c83985c13d53ed81fe41f045082da229dcb67a25 100644 (file)
--- 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 c2a34ef617cfce1318fe474b3cfb5b0e3285ece4..87494b58ea715e7a6b1a12ed154dba0d263de901 100644 (file)
--- 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 d0b1486d2a2513054ce8968779aa11bb088ad998..3f56d070704f307bbccb61ce603b4568df04e759 100644 (file)
--- 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 5e6ac0590c627ba977cb1a33c8683d2bf9f233c5..402a5df9a5082bd57da865fdacc8e669652659c1 100644 (file)
--- 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 7cd0f9d6f7def6b4b6c0363d873548498447e490..639098f737aab3d4010f7ec7392429becc2b0f19 100644 (file)
--- 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 0aa36885510a665f4aef944616cb955d81897c2c..a85c0dec4ba0747e213500353d3d5a775ac38923 100644 (file)
--- 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 3be2b74ea4dc636cc2dc610628cbfa792a582e98..4e83b6175eb6e0ab34c30df89fa28e3d98af91bd 100644 (file)
--- 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 a5edc4f0bd6900b3c516a3ff60740b5c09384c31..fe069a6bdc0402e6c7db278ce1e879259ff19ccb 100644 (file)
--- 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 57737513bf4729a96b460448e116a4f90fba5e14..57e03e60d7e73d41e2e09e93f8b9e00fce3b8123 100644 (file)
--- 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 f331d05d92290e155be3786243129b0df5b31ac9..a527b0e66f59f210cc2509095858ae8ea77046a3 100644 (file)
--- 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 9e8b11d09162c5a0cd333e68ddbf9c961035208a..1780432df7174f0c2a5fc9403e6aa0a3bc443c06 100644 (file)
--- 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 372a82a25686004ac4ad710ebcac2c36049cb326..caba3a5a61650c3bb2a93cb51a3c8fd5d6294108 100644 (file)
--- 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 c269008052ff3a54edc9cfcdc14031b627e2df00..d63dbf946717e7b1c89feabc88dc84bab0eaa235 100644 (file)
--- 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 b4e461fb60515f8e9eef682b165672edcc47a5ac..2872c502473859c4fb5cd461ca8edc34f473070f 100644 (file)
--- 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