--- tests/data/slapd-ldapgluepeople.conf	2004/10/04 20:02:31	1.5
+++ tests/data/slapd-ldapgluepeople.conf	2006/08/01 01:03:43	1.5.2.6
@@ -3,7 +3,7 @@
  kurt Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2003 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -15,15 +15,13 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 #ucdata-path	./ucdata
-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
-
-# password-hash	{md5}
+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
@@ -42,7 +40,7 @@ authz-regexp	"^uid=([^,]+),.*" "uid=$1,o
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=userpassword
+access to attrs=userpassword
 	by dn.exact="uid=proxy,ou=People,dc=example,dc=com" read
 	by self =wx
 	by anonymous =x
@@ -54,10 +52,14 @@ access to *
 # people branch
 database        @BACKEND@
 suffix          "ou=People,dc=example,dc=com"
-directory	./testrun/db.2.a
+directory	@TESTDIR@/db.2.a
 rootdn		"cn=Manager,ou=People,dc=example,dc=com"
 rootpw		secret
-index		objectClass	eq
-index		cn,sn,uid	pres,eq,sub
+#bdb#index		objectClass	eq
+#bdb#index		cn,sn,uid	pres,eq,sub
+#hdb#index		objectClass	eq
+#hdb#index		cn,sn,uid	pres,eq,sub
+#ldbm#index		objectClass	eq
+#ldbm#index		cn,sn,uid	pres,eq,sub
 
-#monitor#database monitor
+#monitor#database	monitor