X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fdata%2Fslapd-glue-syncrepl2.conf;h=1d08a62bd7c1780c7b8667e1329cd13b2a7f6b3b;hb=769083f84816a380a4ae9bb48ab55631ff596751;hp=616ef4dfc8e94e004f88afe6c4712c0a98e06851;hpb=ff89b2c14c38216f58fed97efb5b720131c85c39;p=openldap

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 616ef4dfc8..1d08a62bd7 100644
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.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-2005 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,19 +13,19 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-include		./schema/core.schema
-include		./schema/cosine.schema
-include		./schema/inetorgperson.schema
-include		./schema/openldap.schema
-include		./schema/nis.schema
-pidfile		./testrun/slapd.2.pid
-argsfile	./testrun/slapd.2.args
+include		@SCHEMADIR@/core.schema
+include		@SCHEMADIR@/cosine.schema
+include		@SCHEMADIR@/inetorgperson.schema
+include		@SCHEMADIR@/openldap.schema
+include		@SCHEMADIR@/nis.schema
+pidfile		@TESTDIR@/slapd.2.pid
+argsfile	@TESTDIR@/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#gluemod#moduleload ../servers/slapd/overlays/glue.la
+#syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
 
 #######################################################################
 # database definitions
@@ -34,16 +33,21 @@ argsfile	./testrun/slapd.2.args
 
 database	@BACKEND@
 suffix		"ou=Information Technology Division,ou=People,dc=example,dc=com"
-directory	./testrun/db.2.a
+subordinate
 rootdn		"cn=Manager 2,dc=example,dc=com"
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+#~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
+#ndb#dbname db_4
+#ndb#include @DATADIR@/ndb.conf
+
+
 syncrepl	rid=2
 		provider=@URI1@
 		binddn="cn=Manager 1,dc=example,dc=com"
@@ -55,41 +59,45 @@ syncrepl	rid=2
 		schemachecking=off
 		scope=sub
 		type=refreshAndPersist
-		retry="10 3 300 5"
+		retry="3 10 300 5"
 updateref	@URI1@
 #overlay		syncprov
 
 database	@BACKEND@
 suffix		"ou=Groups,dc=example,dc=com"
-directory	./testrun/db.2.b
+subordinate
 rootdn		"cn=Manager 2,dc=example,dc=com"
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+#~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
+#ndb#dbname db_5
+#ndb#include @DATADIR@/ndb.conf
+
+
 overlay		syncprov
 
 
 database	@BACKEND@
 suffix		"dc=example,dc=com"
-directory	./testrun/db.2.c
 rootdn		"cn=Manager 2,dc=example,dc=com"
 rootpw		secret
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+#~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
+#ndb#dbname db_6
+#ndb#include @DATADIR@/ndb.conf
+
+
 #overlay		syncprov
-overlay		glue
-glue-sub	"ou=Information Technology Division,ou=People,dc=example,dc=com"
-glue-sub	"ou=Groups,dc=example,dc=com"
 
 #monitor#database	monitor