X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4fab92fbc2b63bac2d89c1dae69fa1845cb640b7..114b01dded2c9d72cdd44cac97a4d3cc9f22ddfd:/test/scripts/0000-Basic/0227?ds=sidebyside

diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227
index a67dab2eb..dcb2b97ce 100644
--- a/test/scripts/0000-Basic/0227
+++ b/test/scripts/0000-Basic/0227
@@ -12,12 +12,16 @@ RCPT TO
 QUIT
 250 OK
 ****
+# sender
 sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
+# sender, no callout
 sudo exim -v -bs -oMa V4NET.0.0.2
+HELO test
 MAIL FROM:<unchecked@localhost>
 RCPT TO:<z@test.ex>
 QUIT
@@ -33,7 +37,9 @@ RCPT TO
 QUIT
 250 OK
 ****
+# sender, refused
 sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
@@ -49,7 +55,9 @@ RCPT TO
 QUIT
 250 OK
 ****
+# sender, tmperr
 sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
@@ -63,7 +71,9 @@ MAIL FROM
 QUIT
 250 OK
 ****
+# sender, err on mailfrom
 sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<uncheckable2@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
@@ -78,7 +88,9 @@ MAIL FROM
 QUIT
 250 OK
 ****
+# sender, multiline err on mailfrom
 sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
@@ -88,13 +100,42 @@ server PORT_S
 EHLO
 250 OK
 MAIL FROM
+550 Bad-char error for <> topbitchar:\x80\xFF\xFF
+QUIT
+250 OK
+****
+# sender, err on mailfrom, with bad char
+sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
+MAIL FROM:<uncheckable2@localhost1>
+RCPT TO:<z@test.ex>
+QUIT
+****
+# sender, fail to bind local IP
+sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
+MAIL FROM:<bindfail@localhost1>
+RCPT TO:<z@test.ex>
+QUIT
+****
+#
+#
+#
+#
+server PORT_S
+220 Server ready
+EHLO
+250 OK
+MAIL FROM
 250 OK
 RCPT TO
 550 Recipient not liked
 QUIT
 250 OK
 ****
+# recipient, refused
 sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
@@ -111,12 +152,34 @@ RCPT TO
 QUIT
 250 OK
 ****
+# recipient, refused
 sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 ****
+server PORT_S
+220 Server ready
+EHLO
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+550 Recipient not liked, with bad char:\x80\xFF\xFF
+QUIT
+250 OK
+****
+# recipient, refused, badchar in resp
+sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
+MAIL FROM:<uncheckable@localhost1>
+RCPT TO:<z@remote.domain>
+QUIT
+****
+# recipient, no conneect
 sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
@@ -133,6 +196,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.4
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 DATA
@@ -152,6 +216,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.4
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 DATA
@@ -177,6 +242,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.5
+HELO test
 MAIL FROM:<ok@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
@@ -199,6 +265,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.5
+HELO test
 MAIL FROM:<ok@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
@@ -207,16 +274,17 @@ QUIT
 server PORT_S
 220 Server ready
 EHLO
-250- wotcher
+250- wotcher sverifier
 250-SIZE
 250 OK
-MAIL FROM
+MAIL FROM:<>
 250 OK
 RCPT TO
 250 OK
 QUIT
 250 OK
 ****
+# sender, size known, tgt supports sixe
 sudo exim -v -bs -oMa V4NET.0.0.6
 EHLO me
 MAIL FROM:<ok@localhost1> SIZE=420000
@@ -226,6 +294,76 @@ QUIT
 #
 server PORT_S
 220 Server ready
+EHLO
+250- wotcher rverifier
+250-SIZE
+250 OK
+MAIL FROM:<> SIZE=
+250 OK
+RCPT TO
+250 OK
+QUIT
+250 OK
+****
+# receipient, size known, tgt supports size
+sudo exim -v -bs -oMa V4NET.0.0.3
+EHLO me
+MAIL FROM:<ok@localhost1> SIZE=420000
+RCPT TO:<z@remote.domain>
+QUIT
+****
+#
+server PORT_S
+220 Server ready
+EHLO
+250- wotcher rverifier
+250-SIZE
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO
+250 OK
+QUIT
+250 OK
+****
+# receipient, size unknown, tgt supports size
+sudo exim -v -bs -oMa V4NET.0.0.3
+EHLO me
+MAIL FROM:<ok@localhost1>
+RCPT TO:<z@remote.domain>
+QUIT
+****
+#
+server PORT_S
+220 Server ready
+EHLO
+250- wotcher rverifier
+250-SIZE
+250 OK
+MAIL FROM:<ok@localhost1>
+250 OK
+RCPT TO:<myhost.test.ex-
+550 RANDOM NOT OK
+RSET
+250 OK
+MAIL FROM:<ok@localhost1> SIZE=
+250 OK
+RCPT TO:<z@remote.domain>
+250 OK
+QUIT
+250 OK
+****
+# receipient, size known, tgt supports size, use_sender, w/random
+# stdout should see SIZE on the main but not on the random receipient's MAIL FROM
+sudo exim -v -bs -oMa V4NET.0.0.7
+EHLO me
+MAIL FROM:<ok@localhost1> SIZE=420000
+RCPT TO:<z@remote.domain>
+QUIT
+****
+#
+server PORT_S
+220 Server ready
 LHLO
 250 OK
 MAIL FROM
@@ -236,6 +374,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.lmtp>
 QUIT
@@ -243,11 +382,13 @@ QUIT
 server PORT_S
 ****
 sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<bad@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<bad@localhost1>
 RCPT TO:<z@test.ex>
 QUIT