line up test030 and test032; first step toward their merge

diff --git a/tests/data/relay.out b/tests/data/relay.out
index c2dae2c73a4d199bbd5cb6870f49181bbf071bd0..1380fcbea71b20cad7b85ce7e74795d88131980e 100644 (file)
--- a/tests/data/relay.out
+++ b/tests/data/relay.out
@@ -1965,6 +1965,7 @@ dn: cn=Jane Q. Doe,ou=Information Technology Division,ou=People,o=Beispiel,c=D
 objectClass: OpenLDAPperson
 cn: Jane Alverson
 cn: Jane Q. Doe
+cn: Jane Qissapaolo Doe
 sn: Doe
 uid: jdoe
 title: Programmer Analyst, UM Alumni Association
@@ -2053,7 +2054,7 @@ mail: auser@mail.alumni.example.com
 telephoneNumber: +49 1234-567-890
 description: Just added in o=Beispiel,c=DE naming context
 
-# refldap://ldap.example.com/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://ldap.example.com:389/ou=Referrals,o=Beispiel,c=DE??sub
 
 # searching base="o=Esempio,c=IT"...
 dn: o=Esempio,c=IT
@@ -2377,6 +2378,7 @@ dn: cn=Jane Q. Doe,ou=Information Technology Division,ou=People,o=Esempio,c=IT
 objectClass: OpenLDAPperson
 cn: Jane Alverson
 cn: Jane Q. Doe
+cn: Jane Qissapaolo Doe
 sn: Doe
 uid: jdoe
 title: Programmer Analyst, UM Alumni Association
@@ -2464,28 +2466,30 @@ mail: auser@mail.alumni.example.com
 telephoneNumber: +49 1234-567-890
 description: Just added in o=Beispiel,c=DE naming context
 
-# refldap://ldap.example.com/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://ldap.example.com:389/ou=Referrals,o=Beispiel,c=DE??sub
 
+# searching filter="(objectClass=referral)"
+#      attrs="'*' ref"
 #      base="dc=example,dc=com"...
 dn: ou=Referrals,dc=example,dc=com
 objectClass: referral
 objectClass: extensibleObject
 ou: Referrals
-description: Just added as ldap://localhost.localdomain/ou=Referrals,o=Beispie
- l,c=DE
-description: ...and modified as ldap://ldap.example.com/ou=Referrals,o=Beispie
- l,c=DE
-ref: ldap://ldap.example.com/ou=Referrals,o=Beispiel,c=DE
+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="o=Example,c=US"...
 dn: ou=Referrals,o=Example,c=US
 objectClass: referral
 objectClass: extensibleObject
 ou: Referrals
-description: Just added as ldap://localhost.localdomain/ou=Referrals,o=Beispie
- l,c=DE
-description: ...and modified as ldap://ldap.example.com/ou=Referrals,o=Beispie
- l,c=DE
+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
 
 #      base="o=Esempio,c=IT"...
@@ -2493,10 +2497,10 @@ dn: ou=Referrals,o=Esempio,c=IT
 objectClass: referral
 objectClass: extensibleObject
 ou: Referrals
-description: Just added as ldap://localhost.localdomain/ou=Referrals,o=Beispie
- l,c=DE
-description: ...and modified as ldap://ldap.example.com/ou=Referrals,o=Beispie
- l,c=DE
+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
 
 # searching filter="(seeAlso=cn=all staff,ou=Groups,o=Example,c=US)"
@@ -2536,5 +2540,5 @@ seeAlso: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=Example,c=US
 dn: cn=Added User,ou=Alumni Association,ou=People,o=Example,c=US
 seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 
-# refldap://ldap.example.com/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://ldap.example.com:389/ou=Referrals,o=Beispiel,c=DE??sub
 

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 03538daf113faec4d57d90aa2a114cee644ff051..06b44c8e65d4262663be140b5cef7d2faf0a8437 100755 (executable)
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -155,21 +155,27 @@ newrdn: cn=Jane Q. Doe
 deleteoldrdn: 1
 newsuperior: ou=Information Technology Division,ou=People,$BASEDN
 
+dn: cn=Jane Q. Doe,ou=Information Technology Division,ou=People,$BASEDN
+changetype: modify
+add: cn
+cn: Jane Qissapaolo Doe
+-
+
 dn: ou=Referrals,$BASEDN
 changetype: add
 objectclass: referral
 objectclass: extensibleObject
 ou: Referrals
 ref: ldap://localhost.localdomain/ou=Referrals,$BASEDN
-description: Just added as ldap://localhost.localdomain/ou=Referrals,$BASEDN
+description: Just added as ldap://localhost.localdomain:389/ou=Referrals,$BASEDN
 
 dn: ou=Referrals,$BASEDN
 changetype: modify
 replace: ref
-ref: ldap://ldap.example.com/ou=Referrals,$BASEDN
+ref: ldap://ldap.example.com:389/ou=Referrals,$BASEDN
 -
 add: description
-description: ...and modified as ldap://ldap.example.com/ou=Referrals,$BASEDN
+description: ...and modified as ldap://ldap.example.com:389/ou=Referrals,$BASEDN
 -
 EOMODS
 
@@ -204,6 +210,8 @@ fi
 FILTER="(objectClass=referral)"
 echo "searching filter=\"$FILTER\""
 echo " attrs=\"'*' ref\""
+echo "# searching filter=\"$FILTER\"" >> $SEARCHOUT
+echo "#        attrs=\"'*' ref\"" >> $SEARCHOUT
 
 BASEDN="dc=example,dc=com"
 echo " base=\"$BASEDN\"..."