From 2c66d5f856927920a11956c1cacc25afad0bc64a Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 1 Jan 2005 16:12:29 +0000 Subject: [PATCH] set LDAPURLDesc lud_scope to LDAP_SCOPE_DEFAULT if set to LDAP_SCOPE_BASE, so no trailing '??base' is added to referrals; little more cleanup --- tests/data/relay.out | 4 ++-- tests/scripts/test030-relay | 23 +++++++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/tests/data/relay.out b/tests/data/relay.out index 1380fcbea7..aed2822e74 100644 --- a/tests/data/relay.out +++ b/tests/data/relay.out @@ -2490,7 +2490,7 @@ description: Just added as ldap://localhost.localdomain:389/ou=Referrals,o=Bei spiel,c=DE description: ...and modified as ldap://ldap.example.com:389/ou=Referrals,o=Bei spiel,c=DE -ref: ldap://ldap.example.com:389/ou=Referrals,o=Beispiel,c=DE??base +ref: ldap://ldap.example.com:389/ou=Referrals,o=Beispiel,c=DE # base="o=Esempio,c=IT"... dn: ou=Referrals,o=Esempio,c=IT @@ -2501,7 +2501,7 @@ description: Just added as ldap://localhost.localdomain:389/ou=Referrals,o=Bei spiel,c=DE description: ...and modified as ldap://ldap.example.com:389/ou=Referrals,o=Bei spiel,c=DE -ref: ldap://ldap.example.com:389/ou=Referrals,o=Beispiel,c=DE??base +ref: ldap://ldap.example.com:389/ou=Referrals,o=Beispiel,c=DE # searching filter="(seeAlso=cn=all staff,ou=Groups,o=Example,c=US)" # attrs="seeAlso" diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay index d6bc8b5728..6937380658 100755 --- a/tests/scripts/test030-relay +++ b/tests/scripts/test030-relay @@ -29,25 +29,40 @@ if test "x$RELAYS" = "x" ; then if test $BACKRELAY = relayno ; then echo "relay backend not available, test skipped" else - RELAYS="${RELAYS}relay " + if test "x$RELAYS" != "x" ; then + RELAYS="${RELAYS} " + fi + RELAYS="${RELAYS}relay" fi # back-ldap if test $BACKLDAP = ldapno ; then echo "ldap backend not available, test skipped" else - RELAYS="${RELAYS}ldap " + if test "x$RELAYS" != "x" ; then + RELAYS="${RELAYS} " + fi + RELAYS="${RELAYS}ldap" fi # back-meta if test $BACKMETA = metano ; then echo "meta backend not available, test skipped" else - RELAYS="${RELAYS}meta " + if test "x$RELAYS" != "x" ; then + RELAYS="${RELAYS} " + fi + RELAYS="${RELAYS}meta" fi fi -echo "Using $RELAYS..." +if test "x$RELAYS" = "x" ; then + echo "no relaying capable backend is available" + echo ">>>>> Test succeeded" + exit 0 +fi + +echo "Testing virtual naming context mapping with backend(s) $RELAYS..." echo "" first=1 -- 2.39.5