rfc2589 support (ITS#4293)

[openldap] / tests / data / slapd-nis-master.conf

diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf
index 71b985259823dcd9f56587a5fa1ea9db6a9d82ae..da55398ca6c679dddc2497d15ca8e314cf4fe7da 100644 (file)
--- a/tests/data/slapd-nis-master.conf
+++ b/tests/data/slapd-nis-master.conf
@@ -3,7 +3,7 @@
  2:05:29 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
@@ -14,14 +14,14 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-include                ./schema/others_nis.at.conf
-include                ./schema/others_nis.oc.conf
-include                ./schema/nis.at.conf
-include                ./schema/nis.oc.conf
-include                ./schema/internet_mail.at.conf
-include                ./schema/internet_mail.oc.conf
-pidfile     ./test-db/slapd.pid
-argsfile    ./test-db/slapd.args
+include                @SCHEMADIR@/others_nis.at.conf
+include                @SCHEMADIR@/others_nis.oc.conf
+include                @SCHEMADIR@/nis.at.conf
+include                @SCHEMADIR@/nis.oc.conf
+include                @SCHEMADIR@/internet_mail.at.conf
+include                @SCHEMADIR@/internet_mail.oc.conf
+pidfile                @TESTDIR@/slapd.pid
+argsfile       @TESTDIR@/slapd.args
 
 #mod#modulepath        ../servers/slapd/back-@BACKEND@/
 #mod#moduleload        back_@BACKEND@.la
@@ -35,7 +35,7 @@ argsfile    ./test-db/slapd.args
 database       ldbm
 cachesize      4
 suffix         "o=SGI, c=US"
-directory      ./test-db
+directory      @TESTDIR@
 rootdn         "cn=Manager, o=SGI, c=US"
 rootpw         secret
 index          objectClass     eq