Merge remote branch 'origin/mdb.master'

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

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 77d3cd0b04359a2ac8dc095dab74b96bdcf56e65..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-2009 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -34,16 +34,12 @@ argsfile    @TESTDIR@/slapd.2.args
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/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
+#~null~#directory      @TESTDIR@/db.2.a
+#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
 
@@ -59,23 +55,19 @@ syncrepl    rid=2
                schemachecking=off
                scope=sub
                type=refreshAndPersist
-               retry="3 3 300 5"
+               retry="3 10 300 5"
 updateref      @URI1@
 #overlay               syncprov
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/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
+#~null~#directory      @TESTDIR@/db.2.b
+#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
 
@@ -85,15 +77,12 @@ overlay             syncprov
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/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
+#~null~#directory      @TESTDIR@/db.2.c
+#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