Merge remote branch 'origin/mdb.master'

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

diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index 5ee6a8d8177cd921f5d159b4bb033e6175578c1a..bfb724ffecfc994776fea24f2dd5ce36bdd6b3fb 100644 (file)
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -1,9 +1,8 @@
 # stand-alone slapd config -- for backglue testing (with indexing)
-# $OpenLDAP: pkg/ldap/tests/data/slapd-glue.conf,v 1.5.2.4 2003/12/15 22:05:29
-  kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2007 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -35,32 +34,28 @@ argsfile    @TESTDIR@/slapd.1.args
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/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
+#~null~#directory      @TESTDIR@/db.1.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_1
+#ndb#include @DATADIR@/ndb.conf
 
 overlay                syncprov
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/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
+#~null~#directory      @TESTDIR@/db.1.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_2
+#ndb#include @DATADIR@/ndb.conf
 
 syncrepl       rid=1
                provider=@URI2@
@@ -73,22 +68,21 @@ syncrepl    rid=1
                schemachecking=off
                scope=sub
                type=refreshAndPersist
-               retry="3 3 300 5"
+               retry="3 10 300 5"
 updateref      @URI2@
 #overlay               syncprov
 
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/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
+#~null~#directory      @TESTDIR@/db.1.c
+#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
 
 #overlay               syncprov