X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=tests%2Fdata%2Fslapd-component.conf;h=63928b3eed3747571158ccaa4ca89def80c62393;hb=787e53e6a4e4fefb0cbaae89ef0a3acb138f24f4;hp=738cbc75db065d5de8a500dc60be9cef3ce19c6b;hpb=ff8713131bb37db4b64ae509ac27638b9fe84618;p=openldap

diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf
index 738cbc75db..63928b3eed 100644
--- a/tests/data/slapd-component.conf
+++ b/tests/data/slapd-component.conf
@@ -1,9 +1,8 @@
 # master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-master.conf,v 1.33.2.4 2003/12/15 22:05
- :29 kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2003 The OpenLDAP Foundation.
+## Copyright 1998-2009 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
-include ./schema/test.schema
+include		@SCHEMADIR@/core.schema
+include		@SCHEMADIR@/cosine.schema
+include		@SCHEMADIR@/inetorgperson.schema
+include		@SCHEMADIR@/openldap.schema
+include		@SCHEMADIR@/nis.schema
 
-include ./testdata/ditcontentrules.conf
+include		@DATADIR@/test.schema
+include		@DATADIR@/ditcontentrules.conf
 
-pidfile     ./testrun/slapd.1.pid
-argsfile    ./testrun/slapd.1.args
+pidfile		@TESTDIR@/slapd.1.pid
+argsfile	@TESTDIR@/slapd.1.args
 
-moduleload      ./testdata/comp_libs/compmatch.la
+moduleload      @DATADIR@/comp_libs/compmatch.la
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
@@ -39,10 +38,12 @@ moduleload      ./testdata/comp_libs/compmatch.la
 
 database	@BACKEND@
 suffix		"dc=example,dc=com"
-directory	./testrun/db.1.a
+directory	@TESTDIR@/db.1.a
 rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		secret
-#ldbm#index		objectClass eq
 #bdb#index		objectClass eq
+#hdb#index		objectClass eq
+#ndb#dbname db_1
+#ndb#include @DATADIR@/ndb.conf
 
-#monitor#database monitor
+#monitor#database	monitor