--- tests/data/slapd-proxycache.conf	2008/02/11 23:24:27	1.18.2.7
+++ tests/data/slapd-proxycache.conf	2005/01/01 19:50:01	1.19
@@ -3,7 +3,7 @@
  :05:29 kurt Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2008 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,14 +14,14 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-include		@SCHEMADIR@/core.schema
-include		@SCHEMADIR@/cosine.schema
-include		@SCHEMADIR@/inetorgperson.schema
-include		@SCHEMADIR@/openldap.schema
-include		@SCHEMADIR@/nis.schema
+include ./schema/core.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
+include ./schema/openldap.schema
+include ./schema/nis.schema
 
-pidfile		@TESTDIR@/slapd.2.pid
-argsfile	@TESTDIR@/slapd.2.args
+pidfile     ./testrun/slapd.2.pid
+argsfile    ./testrun/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
@@ -41,7 +41,7 @@ suffix          "dc=example,dc=com"
 rootdn          "dc=example,dc=com"
 uri		"@URI1@"
 
-overlay		pcache
+overlay proxycache
 proxycache	@BACKEND@ 100 2 @ENTRY_LIMIT@ @CACHETTL@
 proxyattrset 0  	sn cn title uid
 proxyattrset 1  	mail postaladdress telephonenumber cn uid
@@ -50,15 +50,9 @@ proxytemplate   	(sn=) 0 @CACHETTL@
 proxytemplate   	(uid=) 1 @CACHETTL@
 proxytemplate   	(mail=) 0 @CACHETTL@
 	
-#bdb#cachesize 20
-#hdb#cachesize 20
-#ldbm#cachesize 20
-directory	@TESTDIR@/db.2.a
-#bdb#index		objectClass	eq
-#bdb#index		cn,sn,uid,mail	pres,eq,sub
-#hdb#index		objectClass	eq
-#hdb#index		cn,sn,uid,mail	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid,mail	pres,eq,sub
+cachesize 20
+directory ./testrun/db.2.a
+index		objectClass	eq
+index		cn,sn,uid,mail	pres,eq,sub
 
-#monitor#database	monitor
+#monitor#database monitor