--- tests/data/slapd-whoami.conf	2004/10/04 20:02:31	1.4
+++ tests/data/slapd-whoami.conf	2007/01/02 21:44:12	1.4.2.8
@@ -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-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,15 +14,13 @@
 ## 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.1.pid
-argsfile    ./testrun/slapd.1.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.1.pid
+argsfile	@TESTDIR@/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
@@ -42,10 +40,10 @@ authz-regexp	"^uid=([^,]+),.*" "ldap:///
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=authzFrom,authzTo
+access to attrs=authzFrom,authzTo
 	by * auth
 
-access to attr=userpassword
+access to attrs=userpassword
 	by anonymous auth
 	by self write
 
@@ -56,10 +54,14 @@ access to *
 database	@BACKEND@
 #ldbm#cachesize	0
 suffix		"dc=example,dc=com"
-directory	./testrun/db.1.a
+directory	@TESTDIR@/db.1.a
 rootdn		"cn=Manager,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