fix format

[openldap] / tests / data / slapd-relay.conf

diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
index f9ef67d7bf8c6ac25678974d3d9a4a20e94158d2..e7ec3e17aa5999b4de123fbbca4970c049e306ce 100644 (file)
--- a/tests/data/slapd-relay.conf
+++ b/tests/data/slapd-relay.conf
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,14 +13,14 @@
 ## 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/ppolicy.schema
-pidfile     ./test-db/slapd.pid
-argsfile    ./test-db/slapd.args
+include                @SCHEMADIR@/core.schema
+include                @SCHEMADIR@/cosine.schema
+include                @SCHEMADIR@/inetorgperson.schema
+include                @SCHEMADIR@/openldap.schema
+include                @SCHEMADIR@/nis.schema
+include                @SCHEMADIR@/ppolicy.schema
+pidfile                @TESTDIR@/slapd.pid
+argsfile       @TESTDIR@/slapd.args
 
 #mod#modulepath        ../servers/slapd/back-@BACKEND@/
 #mod#moduleload        back_@BACKEND@.la
@@ -41,17 +41,18 @@ argsfile    ./test-db/slapd.args
 
 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
 #bdb#index             objectClass eq
 #hdb#index             objectClass eq
-#ldbm#index            objectClass eq
 
 database       @RELAY@
 suffix         "o=Example,c=US"
 ### back-relay can automatically instantiate the rwm overlay
-#relay-relay#relay             "dc=example,dc=com" massage
+#relay-relay#relay             "dc=example,dc=com"
+#relay-relay#overlay           rwm
+#relay-relay#rwm-suffixmassage "dc=example,dc=com"
 #relay-relay#rwm-map           objectClass groupOfNames groupOfUniqueNames
 #relay-relay#rwm-map           objectClass uidObject dcObject
 #relay-relay#rwm-map           attribute member uniqueMember
@@ -87,7 +88,9 @@ suffix                "o=Esempio,c=IT"
 database       @RELAY@
 suffix         "o=Beispiel,c=DE"
 ### back-relay can automatically instantiate the rwm overlay
-#relay-relay#relay             "dc=example,dc=com" massage
+#relay-relay#relay             "dc=example,dc=com"
+#relay-relay#overlay           rwm
+#relay-relay#rwm-suffixmassage "dc=example,dc=com"
 ### back-ldap needs explicit instantiation of the rwm overlay
 #relay-ldap#uri                "@URI1@"
 #relay-ldap#overlay            rwm