set LDAPURLDesc lud_scope to LDAP_SCOPE_DEFAULT if set to LDAP_SCOPE_BASE, so no...

diff --git a/tests/data/relay.out b/tests/data/relay.out
index 1380fcbea71b20cad7b85ce7e74795d88131980e..aed2822e748832553634919e244921e3fb2fcd23 100644 (file)
--- 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 d6bc8b5728acf4e08e496d72f8ceeaabcc9161b7..69373806586724a072262d90d18ca08dfcc3c177 100755 (executable)
--- 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