Merge remote branch 'hbf/mdb.hbf' into mdb

diff --git a/tests/data/regressions/its4184/slapd.conf b/tests/data/regressions/its4184/slapd.conf
index 030cc9dd7c6601c1968a2709c0ae70a1bff65c71..ed23ef8f832f4db4885e65a0c53500067ce8e0a0 100644 (file)
--- a/tests/data/regressions/its4184/slapd.conf
+++ b/tests/data/regressions/its4184/slapd.conf
@@ -41,12 +41,9 @@ rootdn          "cn=Manager,dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.2.a
 
 # Indices to maintain
-#bdb#index             default pres,eq
-#bdb#index             objectClass eq
-#bdb#index             sn pres,eq,sub
-#hdb#index             default pres,eq
-#hdb#index             objectClass eq
-#hdb#index             sn pres,eq,sub
+#indexdb#index         default pres,eq
+#indexdb#index         objectClass eq
+#indexdb#index         sn pres,eq,sub
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
@@ -56,10 +53,7 @@ rootpw               secret
 #~null~#directory      @TESTDIR@/db.1.a
 
 # Indices to maintain
-#bdb#index             default pres,eq
-#bdb#index             objectClass eq
-#bdb#index             sn pres,eq,sub
-#hdb#index             default pres,eq
-#hdb#index             objectClass eq
-#hdb#index             sn pres,eq,sub
+#indexdb#index         default pres,eq
+#indexdb#index         objectClass eq
+#indexdb#index         sn pres,eq,sub
 

diff --git a/tests/data/regressions/its6794/slapd-glue.conf b/tests/data/regressions/its6794/slapd-glue.conf
index 01a109fa2a6f8fa77c7e304acc9590276b325c4a..e95e96aeec8be2f760c176c0b8854e2dcf4b645d 100644 (file)
--- a/tests/data/regressions/its6794/slapd-glue.conf
+++ b/tests/data/regressions/its6794/slapd-glue.conf
@@ -35,12 +35,9 @@ suffix               "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager, dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 
@@ -49,12 +46,9 @@ suffix               "ou=Groups,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager, dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.1.b
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 
@@ -63,12 +57,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager, dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.c
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn      pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn      pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn      pres,eq,sub,subany
 #ndb#dbname db_3
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-2db.conf b/tests/data/slapd-2db.conf
index 57b910db03c3b2d8266f2760fb8f4f941080f625..6028465f3df7ae75c1a0a7fecf62e7bd7095ea2f 100644 (file)
--- a/tests/data/slapd-2db.conf
+++ b/tests/data/slapd-2db.conf
@@ -34,10 +34,8 @@ database     @BACKEND@
 suffix          "cn=Everyone,ou=Groups,dc=example,dc=com"
 subordinate
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 
@@ -46,10 +44,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.b
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-aci.conf b/tests/data/slapd-aci.conf
index 7c823ba6f19e8af0e57df7a67f5315cbe304df18..4db6fe3cd4705c271f2206f195f6e0cc7ca6c8b4 100644 (file)
--- a/tests/data/slapd-aci.conf
+++ b/tests/data/slapd-aci.conf
@@ -46,10 +46,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 5e06783cced17524eb9a3d4be523394a832d91c9..6e9590924633b2eaa02f0ddc7eefb089edfd1f67 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -46,10 +46,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 add_content_acl        on

diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf
index a4b32bb8971b2fb10f0ede8d6a166429876f9887..a6a703a7b65775643d18d90fc1154c6f963367c0 100644 (file)
--- a/tests/data/slapd-cache-master.conf
+++ b/tests/data/slapd-cache-master.conf
@@ -36,10 +36,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf
index 3fd94886e17e9c5ff707c0bf4b1502c257fc2212..4b7daef1e50ff0d9740675f1ef7d9af72b5f072d 100644 (file)
--- a/tests/data/slapd-chain1.conf
+++ b/tests/data/slapd-chain1.conf
@@ -55,10 +55,8 @@ rootdn               "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf
index 88b272ca8a26695f0217366d30711d0840d1fbfe..694c2cd93ea613f3070de94f62e2f86507251595 100644 (file)
--- a/tests/data/slapd-chain2.conf
+++ b/tests/data/slapd-chain2.conf
@@ -43,10 +43,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf
index 61e2b79d6fa7bf4e8a0404364825c33b1b773493..fe88c09ff23faf2bdcd2ea01d2448feceeab50ec 100644 (file)
--- a/tests/data/slapd-component.conf
+++ b/tests/data/slapd-component.conf
@@ -41,8 +41,7 @@ suffix                "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass eq
-#hdb#index             objectClass eq
+#indexdb#index         objectClass eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-config-undo.conf b/tests/data/slapd-config-undo.conf
index 82b5af068ca54bdc1991b0799c89192f25df333b..3487acc42ec30ca9f5d1109549ed312c36b25fc8 100644 (file)
--- a/tests/data/slapd-config-undo.conf
+++ b/tests/data/slapd-config-undo.conf
@@ -10,10 +10,8 @@ suffix               "o=undo"
 rootdn         "cn=Manager,o=undo"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-dds.conf b/tests/data/slapd-dds.conf
index 2db83da5798d286236a1ebd37f48efbd7dd10b4c..7a4ac1c6a2f708be2c61d8f8d03a7bea91c8ab97 100644 (file)
--- a/tests/data/slapd-dds.conf
+++ b/tests/data/slapd-dds.conf
@@ -40,12 +40,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryExpireTimestamp    eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryExpireTimestamp    eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryExpireTimestamp    eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 add_content_acl        on

diff --git a/tests/data/slapd-deltasync-master.conf b/tests/data/slapd-deltasync-master.conf
index 5e875bc01fda2a6fb9c7e7b8263cee7c745ff697..04237ab3670116f1d212be94b9d733a248503f1d 100644 (file)
--- a/tests/data/slapd-deltasync-master.conf
+++ b/tests/data/slapd-deltasync-master.conf
@@ -39,10 +39,8 @@ database     @BACKEND@
 suffix         "cn=log"
 rootdn         "cn=Manager,dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.1.b
-#bdb#index             objectClass     eq
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 
@@ -56,12 +54,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-deltasync-slave.conf b/tests/data/slapd-deltasync-slave.conf
index 99e70875c5d7e86deaa6cb6d4a838cca1107f8fd..49e4baed035dbf5ac10efc2d5999784d2c0adb1b 100644 (file)
--- a/tests/data/slapd-deltasync-slave.conf
+++ b/tests/data/slapd-deltasync-slave.conf
@@ -48,10 +48,8 @@ rootdn               "cn=Replica,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_3
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-dn.conf b/tests/data/slapd-dn.conf
index 76d2172d5140e73a231a429ca0e8025357782ed5..7112537fd7b79a0bf25b8f5c732349b64560f24a 100644 (file)
--- a/tests/data/slapd-dn.conf
+++ b/tests/data/slapd-dn.conf
@@ -38,10 +38,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-dynlist.conf b/tests/data/slapd-dynlist.conf
index ad6be5c20b9ceb5be4e9f2663e889b2ddc338f57..a899dd9a2df607deb8ed0bb898d749239d177cc8 100644 (file)
--- a/tests/data/slapd-dynlist.conf
+++ b/tests/data/slapd-dynlist.conf
@@ -43,10 +43,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-emptydn.conf b/tests/data/slapd-emptydn.conf
index a5111fb3d18befabc451685157b6e3504de3d9ed..29eec3f85a81a0c0c5161f78c6959b18d37e5cbc 100644 (file)
--- a/tests/data/slapd-emptydn.conf
+++ b/tests/data/slapd-emptydn.conf
@@ -43,10 +43,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 
@@ -68,10 +66,8 @@ suffix               ""
 rootdn         "cn=Manager,c=US"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index 9a5b70dea2f5fed119e328d18358ae0cd2c9bc1a..bfb724ffecfc994776fea24f2dd5ce36bdd6b3fb 100644 (file)
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -36,14 +36,10 @@ suffix              "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager 1,dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             entryUUID,entryCSN      pres
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
+#indexdb#index         entryUUID,entryCSN      pres
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 
@@ -54,14 +50,10 @@ suffix              "ou=Groups,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager 1,dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.1.b
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             entryUUID,entryCSN      pres
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
+#indexdb#index         entryUUID,entryCSN      pres
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 
@@ -86,12 +78,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager 1,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.c
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
 #ndb#dbname db_3
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 1d08a62bd7c1780c7b8667e1329cd13b2a7f6b3b..77c090bc3550689d336ee09472c186f3e77f6298 100644 (file)
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -36,14 +36,10 @@ suffix              "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager 2,dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             entryUUID,entryCSN      pres
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
+#indexdb#index         entryUUID,entryCSN      pres
 #ndb#dbname db_4
 #ndb#include @DATADIR@/ndb.conf
 
@@ -68,14 +64,10 @@ suffix              "ou=Groups,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager 2,dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.2.b
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             entryUUID,entryCSN      pres
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
+#indexdb#index         entryUUID,entryCSN      pres
 #ndb#dbname db_5
 #ndb#include @DATADIR@/ndb.conf
 
@@ -88,12 +80,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager 2,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.2.c
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
 #ndb#dbname db_6
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index b977611b3929d42e418ee1a6f960424aaf87e7c7..0e9f15e9d2e26254a43747961193f47791a848d7 100644 (file)
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -35,12 +35,9 @@ suffix               "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager, dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 
@@ -49,12 +46,9 @@ suffix               "ou=Groups,dc=example,dc=com"
 subordinate
 rootdn         "cn=Manager, dc=example,dc=com"
 #~null~#directory      @TESTDIR@/db.1.b
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 
@@ -63,12 +57,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager, dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.c
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#hdb#index             objectclass     eq
-#hdb#index             uid     pres,eq,sub
-#hdb#index             cn,sn   pres,eq,sub,subany
+#indexdb#index         objectclass     eq
+#indexdb#index         uid     pres,eq,sub
+#indexdb#index         cn,sn   pres,eq,sub,subany
 #ndb#dbname db_3
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index a4022489cffd88b3f099ff313e908761737615c3..2c680fc3a23aa7873cd863460267f27687e7a701 100644 (file)
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -63,10 +63,8 @@ rootdn               "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 
@@ -81,10 +79,8 @@ suffix               "dc=example,dc=it"
 rootdn         "cn=Manager,dc=example,dc=it"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index bb3a340388efa7e49019a9aabdbcf42262fdabe0..95c69b84d40e6232f4b3d8d87bf8ad2a8c6006f3 100644 (file)
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -71,10 +71,8 @@ suffix          "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf
index 776b89cd4d5eb7ddc0e0492434e28cb672aacbda..b50716d6f303d332c16666ae6c299ca7bf694f72 100644 (file)
--- a/tests/data/slapd-ldapgluegroups.conf
+++ b/tests/data/slapd-ldapgluegroups.conf
@@ -53,10 +53,8 @@ suffix          "ou=Groups,dc=example,dc=com"
 rootdn         "cn=Manager,ou=Groups,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.3.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_6
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf
index eabd5c4a42fbf73984155caf783eb4ecb5d53139..0c65c57fd98afeab61f6734beb9cb2c9188c634f 100644 (file)
--- a/tests/data/slapd-ldapgluepeople.conf
+++ b/tests/data/slapd-ldapgluepeople.conf
@@ -55,10 +55,8 @@ rootdn               "cn=Manager,ou=People,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_5
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf
index 05105f95b5bb747fe82e02812372a94ee802edd1..9546acd318e743a90425764ce0b2eec1de7dcfdd 100644 (file)
--- a/tests/data/slapd-limits.conf
+++ b/tests/data/slapd-limits.conf
@@ -38,30 +38,16 @@ rootpw              secret
 #~null~#directory      @TESTDIR@/db.1.a
 
 # Need quality indices on "uid" to check "unchecked" limits...
-#bdb#index             objectClass eq
-#bdb#index             uid eq
-#hdb#index             objectClass eq
-#hdb#index             uid eq
-#mdb#index             objectClass eq
-#mdb#index             uid eq
+#indexdb#index         objectClass eq
+#indexdb#index         uid eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 
 # 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
-#bdb#limits    dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4
-#bdb#limits    dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled
-#bdb#limits    dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10
-
-#hdb#limits    dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited
-#hdb#limits    dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4
-#hdb#limits    dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled
-#hdb#limits    dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10
-
-#mdb#limits    dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited
-#mdb#limits    dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4
-#mdb#limits    dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled
-#mdb#limits    dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10
+#maindb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited
+#maindb#limits dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4
+#maindb#limits dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled
+#maindb#limits dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10
 
 limits dn.exact="cn=Unlimited User,ou=People,dc=example,dc=com" size=unlimited time=unlimited
 limits dn.exact="cn=Soft Limited User,ou=People,dc=example,dc=com" size.soft=4 size.hard=unlimited

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index a574ef0d8b9125027ae64ee3c68727fff468cfff..43ff55ade529ee9890199c43ee1ff477805fc095 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -38,8 +38,7 @@ suffix                "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass eq
-#hdb#index             objectClass eq
+#indexdb#index         objectClass eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-meta-target1.conf b/tests/data/slapd-meta-target1.conf
index 14c0a3fd7fcff39854c95694375d1f8f61e56607..f8c977506abdc57a5eae85bdea039beb77832c9b 100644 (file)
--- a/tests/data/slapd-meta-target1.conf
+++ b/tests/data/slapd-meta-target1.conf
@@ -42,10 +42,8 @@ rootdn               "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-meta-target2.conf b/tests/data/slapd-meta-target2.conf
index 1fab34c5225dea353e15bdd22c17c023f8e0a00d..0439031b7d33dd34bf7b56dea36a3090b5e9bfdf 100644 (file)
--- a/tests/data/slapd-meta-target2.conf
+++ b/tests/data/slapd-meta-target2.conf
@@ -47,10 +47,8 @@ rootdn               "cn=Manager,ou=Meta,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf
index 6a42bcee3502487282eda91f77e306c8a50169ed..ff7acf04f85d6e0a2b8a23b65185f0a69abb5cea 100644 (file)
--- a/tests/data/slapd-ppolicy.conf
+++ b/tests/data/slapd-ppolicy.conf
@@ -36,8 +36,7 @@ suffix                "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass eq
-#hdb#index             objectClass eq
+#indexdb#index         objectClass eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index 6bd54585eebe0810435ec2702d3260fe94546af3..3889daf5bd171fe5f73d507df28f59711200a370 100644 (file)
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -58,10 +58,8 @@ pcachebind           (&(objectclass=person)(uid=)) 1 @BTTR@ sub "ou=Alumni Association,ou
 #hdb#cachesize 20
 
 #~null~#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
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid,mail  pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index 2b4a47ae6456229a7fba8165e7dcea319f7d358f..39602073acde176310d2ab681466f53077a9e5ea 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -37,10 +37,8 @@ rootdn               "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index 813ee64294358a241c6ddfe04a105d88f1899e14..4c6a72a8a670aac6368092ce6bdc8101585075ce 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -41,10 +41,8 @@ suffix               "o=University of Mich,c=US"
 rootdn         "cn=Manager,o=University of Mich,c=US"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf
index dd5bd5f4db615ba7759d93d60ce583d0f82950be..b4bb1289636b8d50ad6217746e60f0cee39b8f42 100644 (file)
--- a/tests/data/slapd-referrals.conf
+++ b/tests/data/slapd-referrals.conf
@@ -35,8 +35,7 @@ suffix                "c=us"
 rootdn         "cn=Manager,c=us"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass eq
-#hdb#index             objectClass eq
+#indexdb#index         objectClass eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf
index 3fdff56bddd413044c97a0eb470cd65a3ae8b515..4f57cb510420d06a0b6f21eea069d58b8090fdfb 100644 (file)
--- a/tests/data/slapd-refint.conf
+++ b/tests/data/slapd-refint.conf
@@ -39,10 +39,8 @@ suffix               "o=refint"
 rootdn         "cn=Manager,o=refint"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
index 7444f0257de2375ffde4b64d7103cf19f86eda9a..ed4aa0d259a9136a52ce51af1fcac1d0eae75d51 100644 (file)
--- a/tests/data/slapd-relay.conf
+++ b/tests/data/slapd-relay.conf
@@ -45,8 +45,7 @@ rootdn                "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass eq
-#hdb#index             objectClass eq
+#indexdb#index         objectClass eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-repl-slave-remote.conf b/tests/data/slapd-repl-slave-remote.conf
index 3a3c4a13ae8ec34b37731a1d2edbf9d480ad4a5c..fcc4d235b9370fd05a7a2efd59636fbe6100fa33 100644 (file)
--- a/tests/data/slapd-repl-slave-remote.conf
+++ b/tests/data/slapd-repl-slave-remote.conf
@@ -58,12 +58,9 @@ updatedn     "cn=Monitor"
 updateref      @URI1@
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID       pres,eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID       pres,eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID       pres,eq
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-retcode.conf b/tests/data/slapd-retcode.conf
index 224cf7b462a1970d207c78d36a744a2f167ef13c..bce3b102eb1e619be3f7073e025594bd95879472 100644 (file)
--- a/tests/data/slapd-retcode.conf
+++ b/tests/data/slapd-retcode.conf
@@ -40,10 +40,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index ba14c73bef234398c89f5088e42bb91ad68f1b8b..315bfbb42974c61ba92c14f6a39c6a24106b94f7 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -47,8 +47,7 @@ rootdse       @DATADIR@/rootdse.ldif
 database       @BACKEND@
 suffix         "o=OpenLDAP Project,l=Internet"
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass eq
-#hdb#index             objectClass eq
+#indexdb#index         objectClass eq
 #ndb#dbname db_1_a
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index e9083385f7c4c7ab2a28b4e8be219361e24c8a12..eb92fdc6c77be488add5480fd9d2df9416b4414e 100644 (file)
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -38,12 +38,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-syncrepl-multiproxy.conf b/tests/data/slapd-syncrepl-multiproxy.conf
index a8bea95554e64bad3c0dced63a1a7a2d0eb98393..b91d141eba1473799d855889b12774fdd28fdb85 100644 (file)
--- a/tests/data/slapd-syncrepl-multiproxy.conf
+++ b/tests/data/slapd-syncrepl-multiproxy.conf
@@ -40,12 +40,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index 141b87c62eba20bcabf3b9887d6bc9dd5868bc72..2a0571731503650ec0adbf453c1dbc3dae5cd9b5 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -48,12 +48,9 @@ rootdn               "cn=Replica,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.4.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_4
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index 6412cd538348f74f26b4010793f8c3ad41c61e3f..16be0020a08f7bfd464966b3d9bc55918d1cadef 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -24,12 +24,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.5.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_5
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index 94cfb51b969a4b8dc71d27a073f296be004ba311..32050140d68eb27a61f8db4d443c027751817c8f 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -36,12 +36,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.6.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_6
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index 2160dcb83c4954a7a82415aa3e178afe67ca4953..988566dee0a2b52b7c1048deb4af2fb50b3f94a7 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -39,12 +39,9 @@ rootdn               "cn=Replica,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index 016202aa6b694656bc6bb7efd4835d9f89314b59..cd15e3f66638d4a8e82e6cd774e2e8db828ddbb5 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -36,12 +36,9 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.3.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#bdb#index             entryUUID,entryCSN      eq
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             entryUUID,entryCSN      eq
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
 #ndb#dbname db_3
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf
index bb7dc5c07bde08385ff1bcfedb460bfe7b35dc61..cff497ec3e68b041486e8ff522dd3953b767d5fe 100644 (file)
--- a/tests/data/slapd-translucent-local.conf
+++ b/tests/data/slapd-translucent-local.conf
@@ -45,10 +45,8 @@ rootdn               "o=translucent"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-translucent-remote.conf b/tests/data/slapd-translucent-remote.conf
index 2234df0f44c28ed48bc46ce3b843d18c0eb71eea..ee93b9c1a770d789b356fffc9563190fbb9f7980 100644 (file)
--- a/tests/data/slapd-translucent-remote.conf
+++ b/tests/data/slapd-translucent-remote.conf
@@ -40,9 +40,7 @@ rootdn                "o=translucent"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf

diff --git a/tests/data/slapd-unique.conf b/tests/data/slapd-unique.conf
index ebcf36f1b799e7abdc23f43999dbe1732d6e30cb..43c0e360b7d42d58e171e6e7c56ba270db34dcce 100644 (file)
--- a/tests/data/slapd-unique.conf
+++ b/tests/data/slapd-unique.conf
@@ -39,10 +39,8 @@ suffix               "o=unique"
 rootdn         "cn=Manager,o=unique"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-valregex.conf b/tests/data/slapd-valregex.conf
index 3c55ff84d9727f407dbb1a27ebde6e20a8713507..84152bd5f9e368b34a714803b4384d815b14863e 100644 (file)
--- a/tests/data/slapd-valregex.conf
+++ b/tests/data/slapd-valregex.conf
@@ -47,10 +47,8 @@ rootdn               "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf
index b9a447762fe2f63c1136833a53b00f1feb1116c2..229d5c7f28674ff190d96c77f3eb772af85933b4 100644 (file)
--- a/tests/data/slapd-valsort.conf
+++ b/tests/data/slapd-valsort.conf
@@ -37,10 +37,8 @@ suffix               "o=valsort"
 rootdn         "cn=Manager,o=valsort"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf
index c9bbea570c62677ccff8af4e05e95ef22a7e2b04..2deeb58d0d3e8e38e3349a69c965443c59ac80f9 100644 (file)
--- a/tests/data/slapd-whoami.conf
+++ b/tests/data/slapd-whoami.conf
@@ -56,10 +56,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_1
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 717047a19be7ee1f422f73689574c74b76b562fe..0f800756c39c3cb824de0a1a421abb27f2c1ae69 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -42,11 +42,9 @@ rootdn               "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #bdb#checkpoint                1024 5
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
 #hdb#checkpoint                1024 5
 #mdb#maxsize           33554432
 #ndb#dbname db_1

diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf
index 32b50ae8dba376433955c3f5fb5df1c1db5289a5..fee52d5e8efc361ecefc6b1f782448e6e945403d 100644 (file)
--- a/tests/data/slapd2.conf
+++ b/tests/data/slapd2.conf
@@ -36,10 +36,8 @@ suffix               "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #~null~#directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf
 

diff --git a/tests/run.in b/tests/run.in
index afa6e792775d543084f8685585f5a2eb270ee266..ebaae6173fc7ea05e60eb8c8dca3b3e55e5631d3 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -163,11 +163,22 @@ if test -z "$BACKEND" ; then
                exit 1
        fi
 fi
+
 BACKENDTYPE=`eval 'echo $AC_'$BACKEND`
 if test "x$BACKENDTYPE" = "x" ; then
        BACKENDTYPE="unknown"
 fi
-export BACKEND BACKENDTYPE WAIT KILLSERVERS PRESERVE SYNCMODE USERDATA
+
+# Backend features.  indexdb: indexing and unchecked limit.
+# maindb: main storage backend.  Currently index,limits,mode,paged results.
+INDEXDB=noindexdb MAINDB=nomaindb
+case $BACKEND in
+       bdb|hdb|mdb) INDEXDB=indexdb MAINDB=maindb ;;
+       ndb) INDEXDB=indexdb ;;
+esac
+
+export BACKEND BACKENDTYPE INDEXDB MAINDB \
+       WAIT KILLSERVERS PRESERVE SYNCMODE USERDATA
 
 if test $# = 0 ; then
        echo "$USAGE"; exit 1

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 4bc949a0970f017f4a26502056da519ee630b274..9ac081ee2e56f4f19b72eb9d6c74645c13bd1b2d 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -56,6 +56,8 @@ sed -e "s/@BACKEND@/${BACKEND}/"                      \
        -e "s/^#${AC_translucent}#//"                   \
        -e "s/^#${AC_unique}#//"                        \
        -e "s/^#${AC_valsort}#//"                       \
+       -e "s/^#${INDEXDB}#//"                          \
+       -e "s/^#${MAINDB}#//"                           \
        -e "s/^#${MON}#//"                              \
        -e "s/^#${MONMOD}#//"                           \
        -e "s/^#${SASL}#//"                             \

diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits
index 03adacf0effc6f838898cdfa5a4518e52e653c22..9d1ec12680ce6b84751e8454a136503e3290fc7d 100755 (executable)
--- a/tests/scripts/test025-limits
+++ b/tests/scripts/test025-limits
@@ -501,7 +501,7 @@ case $RC in
        ;;
 esac
 
-case $BACKEND in bdb | hdb | mdb)
+if test $INDEXDB = indexdb ; then
 
 echo "Testing higher than unchecked limit requested for unchecked limited ID..."
 $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \
@@ -554,9 +554,9 @@ case $RC in
                exit $RC
        ;;
 esac
-;;
-*)     echo "Skipping test for unchecked limit with $BACKEND backend." ;;
-esac
+else
+       echo "Skipping test for unchecked limit with $BACKEND backend."
+fi
 
 echo "Testing no limits requested for limited regex..."
 $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \
@@ -749,17 +749,13 @@ case $RC in
        ;;
 esac
 
-case $BACKEND in
-       bdb | hdb | mdb)
-               # only bdb|hdb currently supports pagedResults control
-               ;;
-       *)
+if test $MAINDB != maindb ; then
+               # only bdb|hdb|mdb currently supports pagedResults control
                test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
                echo ">>>>> Test succeeded"
                exit 0
-       ;;
-esac
+fi
 
 if test x"$SLAPD_PAGE_SIZE" != x ; then
        PAGESIZE="$SLAPD_PAGE_SIZE"

diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index faa3514c8be652e069cd7f6bf3007f4acaa2272a..476e5fe9b8add13d41f652241618f49b30b20c93 100755 (executable)
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -265,8 +265,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-case $BACKEND in
-bdb | hdb)
+if test $INDEXDB = indexdb ; then
        $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
 dn: olcDatabase={1}$BACKEND,cn=config
 changetype: modify
@@ -280,8 +279,7 @@ EOF
                test $KILLSERVERS != no && kill -HUP $KILLPIDS
                exit $RC
        fi
-       ;;
-esac
+fi
 
 echo "Using ldapadd to populate provider..."
 $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \

diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multimaster
index 9492896f857fc78baa89745758013e33a2bb827e..57851a3d987a91f4a81ea8e53d01711d09808a4f 100755 (executable)
--- a/tests/scripts/test050-syncrepl-multimaster
+++ b/tests/scripts/test050-syncrepl-multimaster
@@ -311,8 +311,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-case $BACKEND in
-bdb | hdb)
+if test $INDEXDB = indexdb ; then
        $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
 dn: olcDatabase={1}$BACKEND,cn=config
 changetype: modify
@@ -326,8 +325,7 @@ EOF
                test $KILLSERVERS != no && kill -HUP $KILLPIDS
                exit $RC
        fi
-       ;;
-esac
+fi
 
 echo "Using ldapadd to populate server 1..."
 $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \

diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index e3c524b3f6c92aa9b4b4b9d4509b9e1c535f07c2..b697ad8ae543452266c52a24554be23469520cbd 100755 (executable)
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -72,7 +72,9 @@ EOF
        fi
 fi
 
-bdbInclude="# " nullExclude=""
+indexInclude="" mainInclude="" bdbInclude="# " nullExclude=""
+test $INDEXDB = indexdb        || indexInclude="# "
+test $MAINDB  = maindb || mainInclude="# "
 case $BACKEND in
 bdb | hdb) bdbInclude="" ;;
 null) nullExclude="# " ;;
@@ -111,11 +113,11 @@ olcRootPW:: c2VjcmV0
 olcMonitoring: TRUE
 ${nullExclude}olcDbDirectory: $TESTDIR/db.1.a/
 ${bdbInclude}olcDbCacheSize: 1000
-${bdbInclude}olcDbIndex: objectClass eq
-${bdbInclude}olcDbIndex: cn pres,eq,sub
-${bdbInclude}olcDbIndex: uid pres,eq,sub
-${bdbInclude}olcDbIndex: sn pres,eq,sub
-${bdbInclude}olcDbMode: 384"
+${indexInclude}olcDbIndex: objectClass eq
+${indexInclude}olcDbIndex: cn pres,eq,sub
+${indexInclude}olcDbIndex: uid pres,eq,sub
+${indexInclude}olcDbIndex: sn pres,eq,sub
+${mainInclude}olcDbMode: 384"
 
 dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig

diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint
index 46d940bae03d42b6dd42b80fcb963d46e7c86254..a36ba9eb2ba1045e92d0519143ac0bcc3f233751 100755 (executable)
--- a/tests/scripts/test057-memberof-refint
+++ b/tests/scripts/test057-memberof-refint
@@ -66,7 +66,9 @@ fi
 
 cat /dev/null > $TESTOUT
 
-bdbInclude="# " nullExclude=""
+indexInclude="" mainInclude="" bdbInclude="# " nullExclude=""
+test $INDEXDB = indexdb        || indexInclude="# "
+test $MAINDB  = maindb || mainInclude="# "
 case $BACKEND in
 bdb | hdb) bdbInclude="" ;;
 null) nullExclude="# " ;;
@@ -103,11 +105,11 @@ olcRootPW:: c2VjcmV0
 olcMonitoring: TRUE
 ${nullExclude}olcDbDirectory: $TESTDIR/db.1.a/
 ${bdbInclude}olcDbCacheSize: 1000
-${bdbInclude}olcDbIndex: objectClass eq
-${bdbInclude}olcDbIndex: cn pres,eq,sub
-${bdbInclude}olcDbIndex: uid pres,eq,sub
-${bdbInclude}olcDbIndex: sn pres,eq,sub
-${bdbInclude}olcDbMode: 384
+${indexInclude}olcDbIndex: objectClass eq
+${indexInclude}olcDbIndex: cn pres,eq,sub
+${indexInclude}olcDbIndex: uid pres,eq,sub
+${indexInclude}olcDbIndex: sn pres,eq,sub
+${mainInclude}olcDbMode: 384
 
 # {0}memberof, {1}$BACKEND, config
 dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config

diff --git a/tests/scripts/test059-slave-config b/tests/scripts/test059-slave-config
index bc2a9c77c3ba5ca2228f71aeffc6241dbd14abe6..2dc7b3e0bd7a577de66d8bd4a35ca6e7808c92ec 100755 (executable)
--- a/tests/scripts/test059-slave-config
+++ b/tests/scripts/test059-slave-config
@@ -337,8 +337,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-case $BACKEND in
-bdb | hdb)
+if test $INDEXDB = indexdb ; then
        $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
 dn: olcDatabase={2}$BACKEND,cn=config
 changetype: modify
@@ -352,8 +351,7 @@ EOF
                test $KILLSERVERS != no && kill -HUP $KILLPIDS
                exit $RC
        fi
-       ;;
-esac
+fi
 
 echo "Using ldapadd to populate provider..."
 $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \

diff --git a/tests/scripts/test063-delta-multimaster b/tests/scripts/test063-delta-multimaster
index af043057dd7e399ba6492325fbc4e555585c3989..c24bd687af7ebb340c2d9bc7e372db5cdf093da0 100755 (executable)
--- a/tests/scripts/test063-delta-multimaster
+++ b/tests/scripts/test063-delta-multimaster
@@ -113,7 +113,7 @@ EOF
 fi
 MYURI=`eval echo '$URI'$n`
 PROVIDERURI=`eval echo '$URI'$o`
-if [ $BACKEND = hdb -o $BACKEND = bdb ]; then
+if test $INDEXDB = indexdb ; then
 INDEX1="olcDbIndex: objectClass,entryCSN,reqStart,reqDN eq"
 INDEX2="olcDbIndex: objectClass,entryCSN,entryUUID eq"
 else