From: Howard Chu <hyc@openldap.org>
Date: Sun, 5 Dec 2004 00:21:27 +0000 (+0000)
Subject: Use glue overlay
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~133
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0c8851ff9bf6dd30cb0c3a37aa3d0fca0109c6c8;p=openldap

Use glue overlay
---

diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index 8625173c08..3bfdb3127c 100644
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -29,6 +29,7 @@ argsfile    ./testrun/slapd.1.args
 #ldapmod#moduleload back_ldap.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
+#gluemod#moduleload ../servers/slapd/overlays/glue.la
 
 #######################################################################
 # database definitions
@@ -58,7 +59,6 @@ uri             "@URI2@"
 #nosasl#idassert-authcDN "uid=proxy,ou=People,dc=example,dc=com"
 #nosasl#idassert-passwd  proxy
 idassert-mode   self
-subordinate
 
 # groups branch
 database        ldap
@@ -70,7 +70,6 @@ uri             "@URI3@"
 #nosasl#idassert-authcDN "uid=proxy,ou=Groups,dc=example,dc=com"
 #nosasl#idassert-passwd  proxy
 idassert-mode    self
-subordinate
 
 # root
 database        @BACKEND@
@@ -80,5 +79,8 @@ rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
+overlay glue
+glue-sub ou=groups,dc=example,dc=com
+glue-sub ou=people,dc=example,dc=com
 
 #monitor#database monitor
diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue
index 50051cda97..79976b9ae0 100755
--- a/tests/scripts/test029-ldapglue
+++ b/tests/scripts/test029-ldapglue
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-echo "### This test requires the ldap backend."
+echo "### This test requires the ldap backend and glue overlay."
 echo "### If available, and explicitly requested, it can use SASL bind;"
 echo "### note that SASL must be properly set up, and the requested"
 echo "### mechanism must be available.  Define SLAPD_USE_SASL={yes|<mech>},"
@@ -27,6 +27,11 @@ if test $BACKLDAP = "ldapno" ; then
 	exit 0
 fi 
 
+if test $GLUE = "glueno" ; then 
+	echo "glue overlay not available, test skipped"
+	exit 0
+fi 
+
 if test $WITH_SASL = "yes" ; then
 	if test $USE_SASL != "no" ; then
 		if test $USE_SASL = "yes" ; then