add indices for all backends that support them; clenup

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 6d6c8faa7c809818ca065662e8c6af14efa00504..f4c09dbf6383b69ac94c74d66ec7d41cce1b97c9 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -47,10 +47,12 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
+#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 attr=objectclass dn.subtree="dc=example,dc=com"
 access         to attr=objectclass
@@ -103,4 +105,4 @@ access              to dn.subtree="ou=Add & Delete,dc=example,dc=com"
 
 # fall into global ACLs
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf
index 87476f20ddf29dfe565199256991bbad4f09d944..0a0c6b5d1dbccd2a1e022a189eb2b9436bb4fd82 100644 (file)
--- a/tests/data/slapd-cache-master.conf
+++ b/tests/data/slapd-cache-master.conf
@@ -44,4 +44,4 @@ rootpw                secret
 #ldbm#index            objectClass     eq
 #ldbm#index            cn,sn,uid       pres,eq,sub
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf
index 786a87c91f21d4943f7e3bb3c5f131e50f95dde0..8a2a9f0e7236a4594b60ae289f0a3e6596a6a527 100644 (file)
--- a/tests/data/slapd-chain1.conf
+++ b/tests/data/slapd-chain1.conf
@@ -51,7 +51,11 @@ suffix               "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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
+#monitor#database      monitor

diff --git a/tests/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf
index 79d3411180e4082d478b61e8719b835d5873b8e8..d37dc2942273253f539e294b5073139ad4f038ce 100644 (file)
--- a/tests/data/slapd-chain2.conf
+++ b/tests/data/slapd-chain2.conf
@@ -44,8 +44,12 @@ suffix               "dc=example,dc=com"
 directory      ./testrun/db.2.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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;
@@ -55,4 +59,4 @@ chain-uri     @URI1@
 chain-acl-authcDN      "cn=Manager,dc=example,dc=com"
 chain-acl-passwd       secret
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf
index ce988c81576494d85e9c0fc4af33a5cc8df5e430..6be3f59a0fc04ac831754c9ec1bc6828c4c6cd4d 100644 (file)
--- a/tests/data/slapd-component.conf
+++ b/tests/data/slapd-component.conf
@@ -42,7 +42,8 @@ suffix                "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass eq
 #bdb#index             objectClass eq
+#hdb#index             objectClass eq
+#ldbm#index            objectClass eq
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-dn.conf b/tests/data/slapd-dn.conf
index eb429ae8cbc80b3171f4443bd3d1763168679255..b58fe4aa38819acda47e19460d90b120d7fbbcdd 100644 (file)
--- a/tests/data/slapd-dn.conf
+++ b/tests/data/slapd-dn.conf
@@ -44,4 +44,4 @@ rootpw                secret
 #ldbm#index            objectClass     eq
 #ldbm#index            cn,sn,uid       pres,eq,sub
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index e088dcbef09a398e14ce43ec9464a4c1e74e33b7..613d90d6c88006969ec3764c294af6e057f72ac2 100644 (file)
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -36,30 +36,38 @@ database    @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager 1,dc=example,dc=com"
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
 overlay                syncprov
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 directory      ./testrun/db.1.b
 rootdn         "cn=Manager 1,dc=example,dc=com"
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
 syncrepl       rid=1
                provider=@URI2@
                binddn="cn=Manager 2,dc=example,dc=com"
@@ -81,14 +89,17 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.1.c
 rootdn         "cn=Manager 1,dc=example,dc=com"
 rootpw         secret
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
 #overlay               syncprov
 overlay                glue
 glue-sub       "ou=Information Technology Division,ou=People,dc=example,dc=com"

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index c3d45bd7f928ffa730e56681ea8042e0e6469aec..11042ae2a059133d715065f463dff330f0ca90f5 100644 (file)
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -36,15 +36,19 @@ database    @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 directory      ./testrun/db.2.a
 rootdn         "cn=Manager 2,dc=example,dc=com"
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
 syncrepl       rid=2
                provider=@URI1@
                binddn="cn=Manager 1,dc=example,dc=com"
@@ -64,15 +68,19 @@ database    @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 directory      ./testrun/db.2.b
 rootdn         "cn=Manager 2,dc=example,dc=com"
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
-#bdb#index             entryUUID,entryCSN      pres
 overlay                syncprov
 
 
@@ -81,14 +89,17 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.2.c
 rootdn         "cn=Manager 2,dc=example,dc=com"
 rootpw         secret
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
 #overlay               syncprov
 overlay                glue
 glue-sub       "ou=Information Technology Division,ou=People,dc=example,dc=com"

diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index fe529c6d5e213cb416ee3fcbd5b53a8a03439926..69e9178c565780fb18d690cd6fb2f465e977b634 100644 (file)
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -36,43 +36,52 @@ database    @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager, dc=example,dc=com"
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 directory      ./testrun/db.1.b
 rootdn         "cn=Manager, dc=example,dc=com"
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
 directory      ./testrun/db.1.c
 rootdn         "cn=Manager, dc=example,dc=com"
 rootpw         secret
+#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
 #ldbm#index            objectclass     eq
 #ldbm#index            uid     pres,eq,sub
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             cn,sn   pres,eq,sub,subany
 overlay glue
-glue-sub               "ou=Information Technology Division,ou=People,dc=example,dc=com"
-glue-sub               "ou=Groups,dc=example,dc=com"
+glue-sub       "ou=Information Technology Division,ou=People,dc=example,dc=com"
+glue-sub       "ou=Groups,dc=example,dc=com"
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index 6ade32efd89543051f144cb4000d7bd0fb4dffbb..b9ecdc6535be3415b4e20111aed09fcb57f23a6f 100644 (file)
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -63,8 +63,12 @@ suffix               "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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"
                attr=authzTo
@@ -77,8 +81,12 @@ suffix               "dc=example,dc=it"
 directory      ./testrun/db.2.a
 rootdn         "cn=Manager,dc=example,dc=it"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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"
@@ -119,4 +127,4 @@ access to *
        by dn.exact="cn=Sandbox,ou=Admin,dc=example,dc=com" search
        by * none
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index a07599d676d09dd2675512838332e8800540d56d..e235aed4d8a0a3bf00005fe576c6a37aa9802d26 100644 (file)
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -55,7 +55,7 @@ suffix          "ou=People,dc=example,dc=com"
 uri             "@URI2@"
 # FIXME: doesn't work with authz=native
 #sasl#idassert-bind    bindmethod=sasl authcid=proxy credentials=proxy @SASL_MECH@ mode=self
-#nosasl#idassert-bind  bindmethod=simple binddn"uid=proxy,ou=People,dc=example,dc=com" credentials=proxy mode=self
+#nosasl#idassert-bind  bindmethod=simple binddn="uid=proxy,ou=People,dc=example,dc=com" credentials=proxy mode=self
 
 # groups branch
 database        ldap
@@ -71,10 +71,14 @@ suffix          "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
-overlay glue
-glue-sub ou=groups,dc=example,dc=com
-glue-sub ou=people,dc=example,dc=com
+#bdb#index             objectClass     eq
+#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                glue
+glue-sub       "ou=groups,dc=example,dc=com"
+glue-sub       "ou=people,dc=example,dc=com"
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf
index ca0682ea89dfd7be53aeef05290045c9991346b4..a5f1f9f43096b73d02de7e0bd58f7b7277762c46 100644 (file)
--- a/tests/data/slapd-ldapgluegroups.conf
+++ b/tests/data/slapd-ldapgluegroups.conf
@@ -54,7 +54,11 @@ suffix          "ou=Groups,dc=example,dc=com"
 directory      ./testrun/db.3.a
 rootdn         "cn=Manager,ou=Groups,dc=example,dc=com"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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
+#monitor#database      monitor

diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf
index 0f3f4fa6ade461b2666dbdbdb0c4f36b10f2781f..a5a6d28ca8ac7907a7353b70eae3f031078a1560 100644 (file)
--- a/tests/data/slapd-ldapgluepeople.conf
+++ b/tests/data/slapd-ldapgluepeople.conf
@@ -55,7 +55,11 @@ suffix          "ou=People,dc=example,dc=com"
 directory      ./testrun/db.2.a
 rootdn         "cn=Manager,ou=People,dc=example,dc=com"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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
+#monitor#database      monitor

diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf
index 6b51b12693bc91e444ed9f56cdc29c3574f6b17b..a38719392f562f98f63aec02a1222698919e5296 100644 (file)
--- a/tests/data/slapd-limits.conf
+++ b/tests/data/slapd-limits.conf
@@ -37,12 +37,12 @@ directory   ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 # Need quality indices on "uid" to check "unchecked" limits...
-#ldbm#index            objectClass eq
-#ldbm#index            uid eq
 #bdb#index             objectClass eq
 #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
@@ -67,4 +67,4 @@ limits        dn.subtree="ou=Admin,dc=example,dc=com" size.soft=3
 limits users size.soft=2
 limits anonymous size.soft=1
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 2f5828ef660b035156bcc962a5e5bb94b3b6dfe4..f10ca6ff7257ec2d6cc3fe7fecdd0ca9d0e66082 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -39,7 +39,8 @@ suffix                "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass eq
 #bdb#index             objectClass eq
+#hdb#index             objectClass eq
+#ldbm#index            objectClass eq
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-meta2.conf b/tests/data/slapd-meta2.conf
index dc65690a0c5ec1b305f75b93a986834b6eeae82b..e4487a4a0edecc72d61a11a8ac1eb20772b145a7 100644 (file)
--- a/tests/data/slapd-meta2.conf
+++ b/tests/data/slapd-meta2.conf
@@ -45,6 +45,7 @@ directory     ./testrun/db.2.a
 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 f58e536ff5eafa84d0971830d53768cd8c5a817d..bcfd5985dd1e492d9257e74e0e6f53df49157661 100644 (file)
--- a/tests/data/slapd-ppolicy.conf
+++ b/tests/data/slapd-ppolicy.conf
@@ -53,4 +53,4 @@ access to *
        by self write
        by * read
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index 1fac77c7d123ba542c62ef595b2f287a8b75e070..f739315e066a4cf51e4429f0450d77029b7bef8d 100644 (file)
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -53,7 +53,7 @@ proxytemplate         (mail=) 0 @CACHETTL@
 #bdb#cachesize 20
 #hdb#cachesize 20
 #ldbm#cachesize 20
-directory ./testrun/db.2.a
+directory      ./testrun/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid,mail  pres,eq,sub
 #hdb#index             objectClass     eq
@@ -61,4 +61,4 @@ directory ./testrun/db.2.a
 #ldbm#index            objectClass     eq
 #ldbm#index            cn,sn,uid,mail  pres,eq,sub
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index e03f205d1767c580315c3b68a875c8472d20b9e3..b86c2281e155e77dd8b400bcfd1908cd9ca935bf 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -57,4 +57,4 @@ access to *
        by self write
        by * read
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index c36847bf4812586a801aa2da0ae1e076aa39dc30..bdec8ae22e31ee5bc24a9ff593fd4b74acaf4f17 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -42,9 +42,11 @@ suffix               "o=University of Mich,c=US"
 directory      ./testrun/db.2.a
 rootdn         "cn=Manager,o=University of Mich,c=US"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
+#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
+#monitor#database      monitor

diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf
index 3de976ff02c8afac3058013ad8e6f16718577073..e3431ce342a427a5dcfe2503f7c62742361f1541 100644 (file)
--- a/tests/data/slapd-referrals.conf
+++ b/tests/data/slapd-referrals.conf
@@ -36,7 +36,8 @@ suffix                "c=us"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,c=us"
 rootpw         secret
-#ldbm#index            objectClass eq
 #bdb#index             objectClass eq
+#hdb#index             objectClass eq
+#ldbm#index            objectClass eq
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf
index 3d80502799b302081e97834d3cf167e41bd4c56a..54ff0a7ea33245916dc66cf2edf790770d443fd9 100644 (file)
--- a/tests/data/slapd-refint.conf
+++ b/tests/data/slapd-refint.conf
@@ -39,10 +39,14 @@ suffix              "o=refint"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,o=refint"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
index 3948c10966a50ae101e4c6ed6be9f6014c176e31..f9ef67d7bf8c6ac25678974d3d9a4a20e94158d2 100644 (file)
--- a/tests/data/slapd-relay.conf
+++ b/tests/data/slapd-relay.conf
@@ -44,7 +44,9 @@ suffix                "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-index          objectClass eq
+#bdb#index             objectClass eq
+#hdb#index             objectClass eq
+#ldbm#index            objectClass eq
 
 database       @RELAY@
 suffix         "o=Example,c=US"
@@ -93,4 +95,4 @@ suffix                "o=Beispiel,c=DE"
 #relay-meta#uri                "@URI1@o=Beispiel,c=DE"
 #relay-meta#suffixmassage      "o=Beispiel,c=DE" "dc=example,dc=com"
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index af4580d1f6b367a3f02a091c191f94a3e67df481..ff50863760dfcea02a85468312cba1534795b959 100644 (file)
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -38,10 +38,12 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
+#hdb#index             objectClass     eq
+#hdb#index             cn,sn,uid       pres,eq,sub
+#ldbm#index            objectClass     eq
+#ldbm#index            cn,sn,uid       pres,eq,sub
 
 replogfile     ./testrun/slapd.1.replog
 
@@ -50,4 +52,4 @@ replica               host=localhost:@PORT2@
                bindmethod=simple
                credentials=secret
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index 2de1bf49f2f9eb3cd49cb5b32e4201c07c2cf240..b64c40be15464e62d5215e03f485539bf6745bef 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -49,9 +49,11 @@ rootdn               "cn=Replica,dc=example,dc=com"
 rootpw         secret
 updatedn       "cn=Replica,dc=example,dc=com"
 updateref      @URI1@
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #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-retcode.conf b/tests/data/slapd-retcode.conf
index 94c608fc1f82d43c38fb8f0744a8bd380b5c5bc9..a83e88d317b56c47b649a1738a7c65308f7345bd 100644 (file)
--- a/tests/data/slapd-retcode.conf
+++ b/tests/data/slapd-retcode.conf
@@ -42,6 +42,8 @@ rootdn                "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #bdb#index             objectClass     eq
 #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
 
@@ -49,4 +51,4 @@ overlay               retcode
 retcode-parent "ou=RetCodes,dc=example,dc=com"
 include                testdata/retcode.conf
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index d1f82f617718027ed08224542963706cb3b5c43c..3d41d0cc356157215d634b8f79756ee7e6a12f4b 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -48,12 +48,13 @@ rootdse     ./testdata/rootdse.ldif
 database       @BACKEND@
 suffix         "o=OpenLDAP Project,l=Internet"
 directory      ./testrun/db.1.a
-#ldbm#index            objectClass eq
 #bdb#index             objectClass eq
+#hdb#index             objectClass eq
+#ldbm#index            objectClass eq
 
 #database      @BACKEND@
 #suffix                "dc=example,dc=com"
 #directory     ./testrun/db.1.b
 #index         objectClass eq
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index b4e93e47f0456d5e495a902f7532a04f5a7fd387..ecbf760e8c5fe044e8d1f668240b9655983f44c1 100644 (file)
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -39,13 +39,16 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq
+#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
+overlay        syncprov
 #syncprov-sessionlog 100
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index c930f3c1c9ec067724fe5600c96e40158c00402e..9caae200af3f49e26558cd5ca90758886f06efee 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -48,25 +48,27 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.4.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
+#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
-                provider=@URI1@
-                binddn="cn=Manager,dc=example,dc=com"
-                bindmethod=simple
-                credentials=secret
-                searchbase="dc=example,dc=com"
-                filter="(objectClass=*)"
-                attrs="*,+"
-                schemachecking=off
-                scope=sub
-                type=refreshAndPersist
+syncrepl       rid=1
+               provider=@URI1@
+               binddn="cn=Manager,dc=example,dc=com"
+               bindmethod=simple
+               credentials=secret
+               searchbase="dc=example,dc=com"
+               filter="(objectClass=*)"
+               attrs="*,+"
+               schemachecking=off
+               scope=sub
+               type=refreshAndPersist
 updateref      @URI1@
 
-overlay syncprov
+overlay                syncprov
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index 1f3f47c93507c5e91cffb5212d3534d97d31e0a4..b49154fa73534be327f978b43307a284fdf14cf0 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -25,23 +25,26 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.5.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq
+#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
-                provider=@URI4@
-                binddn="cn=Replica,dc=example,dc=com"
-                bindmethod=simple
-                credentials=secret
-                searchbase="dc=example,dc=com"
-                filter="(objectClass=*)"
-                attrs="*"
-                schemachecking=off
-                scope=sub
-                type=refreshAndPersist
+syncrepl       rid=1
+               provider=@URI4@
+               binddn="cn=Replica,dc=example,dc=com"
+               bindmethod=simple
+               credentials=secret
+               searchbase="dc=example,dc=com"
+               filter="(objectClass=*)"
+               attrs="*"
+               schemachecking=off
+               scope=sub
+               type=refreshAndPersist
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index cb4576cc24300f2bc5c072bbf82d9c75852a9a54..e0d6a63a09541db5065a163c441713fdc5107c2f 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -37,23 +37,26 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.6.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq
+#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
-                provider=@URI1@
-                binddn="cn=Manager,dc=example,dc=com"
-                bindmethod=simple
-                credentials=secret
-                searchbase="dc=example,dc=com"
-                filter="(objectClass=*)"
-                attrs="*"
-                schemachecking=off
-                scope=sub
-                type=refreshAndPersist
+syncrepl       rid=1
+               provider=@URI1@
+               binddn="cn=Manager,dc=example,dc=com"
+               bindmethod=simple
+               credentials=secret
+               searchbase="dc=example,dc=com"
+               filter="(objectClass=*)"
+               attrs="*"
+               schemachecking=off
+               scope=sub
+               type=refreshAndPersist
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index ddf424dfb374bc6e6b141f71a86fad94efe19d10..35390ee6c50c58c9cf046f1f645a8cb435988460 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -39,31 +39,32 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.2.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
-#ldbm#index            entryUUID       eq
 #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
+#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
-                provider=@URI1@
-                binddn="cn=Manager,dc=example,dc=com"
-                bindmethod=simple
-                credentials=secret
-                searchbase="dc=example,dc=com"
-                filter="(objectClass=*)"
-                attrs="*"
-                schemachecking=off
-                scope=sub
-                type=refreshOnly
-                interval=00:00:00:10
+syncrepl       rid=1
+               provider=@URI1@
+               binddn="cn=Manager,dc=example,dc=com"
+               bindmethod=simple
+               credentials=secret
+               searchbase="dc=example,dc=com"
+               filter="(objectClass=*)"
+               attrs="*"
+               schemachecking=off
+               scope=sub
+               type=refreshOnly
+               interval=00:00:00:10
 updateref      @URI1@
 
-overlay syncprov
+overlay                syncprov
 syncprov-sessionlog 100
 
-
-
 #monitor#database      monitor

diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index 780d2fde9a5b82bb1abe6ccf1a9efc66ca144691..ee3358f5976afea56a9c3cd84213b86138e86827 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -37,25 +37,28 @@ suffix              "dc=example,dc=com"
 directory      ./testrun/db.3.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
-#ldbm#index            entryUUID       eq
 #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
+#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
-                provider=@URI2@
-                binddn="cn=Replica,dc=example,dc=com"
-                bindmethod=simple
-                credentials=secret
-                searchbase="dc=example,dc=com"
-                filter="(objectClass=*)"
-                attrs="*"
-                schemachecking=off
-                scope=sub
-                type=refreshOnly
-                interval=00:00:00:10
+syncrepl       rid=1
+               provider=@URI2@
+               binddn="cn=Replica,dc=example,dc=com"
+               bindmethod=simple
+               credentials=secret
+               searchbase="dc=example,dc=com"
+               filter="(objectClass=*)"
+               attrs="*"
+               schemachecking=off
+               scope=sub
+               type=refreshOnly
+               interval=00:00:00:10
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf
index 3703de92b7aade2415f58cfe07ec0c1cd331bf93..5d7737e8b45b7ef2d11227460c9a0bf6f97227ba 100644 (file)
--- a/tests/data/slapd-translucent-local.conf
+++ b/tests/data/slapd-translucent-local.conf
@@ -44,8 +44,12 @@ suffix               "o=translucent"
 directory      ./testrun/db.2.a
 rootdn         "o=translucent"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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 8fc31e48152c6048e5fa41870d282ff9dc9c51be..47c35a9e3b4da7b49ab8c764842c562740d22fa7 100644 (file)
--- a/tests/data/slapd-translucent-remote.conf
+++ b/tests/data/slapd-translucent-remote.conf
@@ -40,6 +40,10 @@ suffix               "o=translucent"
 directory      ./testrun/db.1.a
 rootdn         "o=translucent"
 rootpw         secret
-index          objectClass     eq
-index          cn,sn,uid       pres,eq,sub
+#bdb#index             objectClass     eq
+#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 8d16feb035a951cafe4bbe970d95e0a8ed790187..b2dcb474e52a730b3742ef2d3e176c09c0fa5969 100644 (file)
--- a/tests/data/slapd-unique.conf
+++ b/tests/data/slapd-unique.conf
@@ -50,4 +50,4 @@ overlay                       unique
 unique_ignore          o cn sn ou objectClass
 unique_attributes      employeeNumber
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf
index c24b781629587d35b3dcf30963a65039a7263c11..7b64ed9571c4810cbb363fe67818b53b4c1a59a5 100644 (file)
--- a/tests/data/slapd-whoami.conf
+++ b/tests/data/slapd-whoami.conf
@@ -64,4 +64,4 @@ rootpw                secret
 #ldbm#index            objectClass     eq
 #ldbm#index            cn,sn,uid       pres,eq,sub
 
-#monitor#database monitor
+#monitor#database      monitor

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 2d3be6b33ff35575c43c51cf6b226b329b97a684..6523c4fae1ce7e5ea177e6a704bbac7de6c263b6 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -40,7 +40,9 @@ rootdn                "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #bdb#index             objectClass     eq
 #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
+#monitor#database      monitor

diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf
index 3517cdc2db3b2b7a14971a6eeae10ea31c25522e..8b992629d06234566120dbb070518fcf4cc41ee2 100644 (file)
--- a/tests/data/slapd2.conf
+++ b/tests/data/slapd2.conf
@@ -40,4 +40,4 @@ rootpw                secret
 index          objectClass     eq
 index          cn,sn,uid       pres,eq,sub
 
-#monitor#database monitor
+#monitor#database      monitor