more ITS#3498-9 cleanup

diff --git a/tests/data/relay.out b/tests/data/relay.out
index 6998c883afd6422d5c2dce7b5a41c4d5fcbf7d03..9588fd7db7dc65ddb7c9bfa16d6dc0cf3fab2939 100644 (file)
--- a/tests/data/relay.out
+++ b/tests/data/relay.out
@@ -1969,7 +1969,6 @@ sn: Doe
 uid: jdoe
 title: Programmer Analyst, UM Alumni Association
 postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 homePostalAddress: 123 Anystreet $ Anytown, MI 48104
 drink: diet coke
 description: Enthusiastic
@@ -1978,6 +1977,7 @@ homePhone: +1 313 555 5445
 pager: +1 313 555 1220
 facsimileTelephoneNumber: +1 313 555 2311
 telephoneNumber: +1 313 555 4774
+seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 
 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=Example,c=US
 objectClass: OpenLDAPperson
@@ -2394,7 +2394,6 @@ sn: Doe
 uid: jdoe
 title: Programmer Analyst, UM Alumni Association
 postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,o=Esempio,c=IT
 homePostalAddress: 123 Anystreet $ Anytown, MI 48104
 drink: diet coke
 description: Enthusiastic
@@ -2403,6 +2402,7 @@ homePhone: +1 313 555 5445
 pager: +1 313 555 1220
 facsimileTelephoneNumber: +1 313 555 2311
 telephoneNumber: +1 313 555 4774
+seeAlso: cn=All Staff,ou=Groups,o=Esempio,c=IT
 
 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=Esempio,c=IT
 objectClass: OpenLDAPperson
@@ -2567,7 +2567,7 @@ seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 # refldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE??sub
 
 # searching filter="(member=cn=Another Added Group,ou=Groups,o=Example,c=US)"
-#      attrs="seeAlso"
+#      attrs="member"
 #      base="o=Example,c=US"...
 # refldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE??sub
 

diff --git a/tests/scripts/relay b/tests/scripts/relay
index 490c9cedc3f1fba1e47856256f3bcdaa9c7ebd79..befaee6cff95406ebf16d00a3464b2314e963efa 100755 (executable)
--- a/tests/scripts/relay
+++ b/tests/scripts/relay
@@ -148,6 +148,15 @@ changetype: modify
 add: cn
 cn: Jane Qissapaolo Doe
 -
+# This operation (delete of DN-valued attribute) triggered ITS#3498
+delete: seeAlso
+-
+
+dn: cn=Jane Q. Doe,ou=Information Technology Division,ou=People,$BASEDN
+changetype: modify
+add: seeAlso
+seeAlso: cn=All Staff,ou=Groups,$BASEDN
+-
 
 dn: ou=Referrals,$BASEDN
 changetype: add
@@ -178,6 +187,7 @@ BASEDN="o=Example,c=US"
 echo "Modifying database \"$BASEDN\"..."
 $LDAPMODIFY -v -D "cn=Manager,$BASEDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
        -M >> $TESTOUT 2>&1 << EOMODS
+# These operations (updates with objectClass mapping) triggered ITS#3499
 dn: cn=Added Group,ou=Groups,$BASEDN
 changetype: add
 objectClass: groupOfNames
@@ -248,7 +258,7 @@ echo "#     attrs=\"'*' ref\"" >> $SEARCHOUT
 BASEDN="dc=example,dc=com"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -260,7 +270,7 @@ fi
 BASEDN="o=Example,c=US"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -272,7 +282,7 @@ fi
 BASEDN="o=Esempio,c=IT"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -304,7 +314,7 @@ echo "Searching filter=\"$FILTER\""
 echo " attrs=\"member\""
 echo " base=\"$BASEDN\"..."
 echo "# searching filter=\"$FILTER\"" >> $SEARCHOUT
-echo "#        attrs=\"seeAlso\"" >> $SEARCHOUT
+echo "#        attrs=\"member\"" >> $SEARCHOUT
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
 $LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" member \
        >> $SEARCHOUT 2>&1