--- tests/data/slapd-glue-syncrepl2.conf	2005/01/29 18:06:11	1.2
+++ tests/data/slapd-glue-syncrepl2.conf	2006/01/03 22:16:27	1.3.2.6
@@ -3,7 +3,7 @@
   kurt Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,19 +14,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 +34,22 @@ argsfile	./testrun/slapd.2.args
 
 database	@BACKEND@
 suffix		"ou=Information Technology Division,ou=People,dc=example,dc=com"
-directory	./testrun/db.2.a
+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
 #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
 syncrepl	rid=2
 		provider=@URI1@
 		binddn="cn=Manager 1,dc=example,dc=com"
@@ -61,35 +67,41 @@ updateref	@URI1@
 
 database	@BACKEND@
 suffix		"ou=Groups,dc=example,dc=com"
-directory	./testrun/db.2.b
+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
 #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
 
 
 database	@BACKEND@
 suffix		"dc=example,dc=com"
-directory	./testrun/db.2.c
+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
 #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"
-glue-sub	"ou=Groups,dc=example,dc=com"
 
 #monitor#database	monitor