Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / tests / data / slapd-glue-syncrepl2.conf

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 1d08a62bd7c1780c7b8667e1329cd13b2a7f6b3b..4f4dfb4f454d5709a8d187bf116890d58acb8ebe 100644 (file)
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2011 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -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