From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 12 Jul 2004 00:19:15 +0000 (+0000)
Subject: ad test for back-relay and rwm overlay
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~84
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c50386b883326848e6b7f0a3dab95b226b6b1ea;p=openldap

ad test for back-relay and rwm overlay
---

diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
new file mode 100644
index 0000000000..77b5bc1b0e
--- /dev/null
+++ b/tests/data/slapd-relay.conf
@@ -0,0 +1,51 @@
+# master slapd config -- for testing
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2004 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## 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
+
+#mod#modulepath	../servers/slapd/back-@BACKEND@/
+#mod#moduleload	back_@BACKEND@.la
+#rwmmod#moduleload ../servers/slapd/overlays/rwm.la
+
+#######################################################################
+# ldbm database definitions
+#######################################################################
+
+database	@BACKEND@
+suffix		"dc=example,dc=com"
+directory	./testrun/db.1.a
+rootdn		"cn=Manager,dc=example,dc=com"
+rootpw		secret
+index		objectClass eq
+
+database	relay
+suffix		"o=Example,c=US"
+relay		"dc=example,dc=com" massage
+
+database	relay
+suffix		"o=Esempio,c=IT"
+relay		"dc=example,dc=com" massage
+
+database	relay
+suffix		"o=Beispiel,c=DE"
+relay		"dc=example,dc=com" massage
+
diff --git a/tests/run.in b/tests/run.in
index eb5244ab03..1026c0b7ff 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -26,16 +26,18 @@ AC_bdb=@BUILD_BDB@
 AC_hdb=@BUILD_HDB@
 AC_ldbm=@BUILD_LDBM@
 AC_ldap=ldap@BUILD_LDAP@
+AC_relay=relay@BUILD_RELAY@
 AC_pcache=pcache@BUILD_PROXYCACHE@
 AC_ppolicy=ppolicy@BUILD_PPOLICY@
 AC_refint=refint@BUILD_REFINT@
 AC_unique=unique@BUILD_UNIQUE@
+AC_rwm=rwm@BUILD_RWM@
 AC_MONITOR=@BUILD_MONITOR@
 AC_WITH_SASL=@WITH_SASL@
 AC_WITH_TLS=@WITH_TLS@
 
-export AC_MONITOR AC_WITH_SASL AC_WITH_TLS AC_ldap AC_pcache AC_ppolicy
-export AC_refint AC_unique
+export AC_MONITOR AC_WITH_SASL AC_WITH_TLS AC_ldap AC_relay
+export AC_pcache AC_ppolicy AC_refint AC_unique AC_rwm
 
 if test ! -x ../servers/slapd/slapd ; then
 	echo "Could not locate slapd(8)"
diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 4c2b6ed419..23b9e96978 100755
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -36,10 +36,12 @@ sed -e "s/@BACKEND@/${BACKEND}/"			\
 	-e "s/^#${BACKEND}#//"				\
 	-e "s/^#${BACKENDTYPE}#//"			\
 	-e "s/^#${AC_ldap}#//"				\
+	-e "s/^#${AC_relay}#//"				\
 	-e "s/^#${AC_pcache}#//"			\
 	-e "s/^#${AC_ppolicy}#//"			\
 	-e "s/^#${AC_refint}#//"			\
 	-e "s/^#${AC_unique}#//"			\
+	-e "s/^#${AC_rwm}#//"			\
 	-e "s/^#${MON}#//"				\
 	-e "s/^#${MONMOD}#//"				\
 	-e "s/^#${SASL}#//"				\
diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 858ab6c1f2..6d9f3048d5 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -15,10 +15,12 @@
 
 MONITORDB=${AC_MONITOR-no}
 BACKLDAP=${AC_ldap-ldapno}
+BACKRELAY=${AC_relay-relayno}
 PROXYCACHE=${AC_pcache-pcacheno}
 PPOLICY=${AC_ppolicy-ppolicyno}
 REFINT=${AC_refint-refintno}
 UNIQUE=${AC_unique-uniqueno}
+RWM=${AC_rwm-rwmno}
 WITH_SASL=${AC_WITH_SASL-no}
 USE_SASL=${SLAPD_USE_SASL-no}
 WITHTLS=${AC_WITHTLS-yes}
@@ -67,6 +69,7 @@ IDASSERTCONF=$DATADIR/slapd-idassert.conf
 LDAPGLUECONF1=$DATADIR/slapd-ldapglue.conf
 LDAPGLUECONF2=$DATADIR/slapd-ldapgluepeople.conf
 LDAPGLUECONF3=$DATADIR/slapd-ldapgluegroups.conf
+RWMCONF=$DATADIR/slapd-relay.conf
 
 CONF1=$TESTDIR/slapd.1.conf
 CONF2=$TESTDIR/slapd.2.conf