DMARC: Avoid using Resent-From: header. Bug 3029

[exim.git] / test / stdout / 0227

diff --git a/test/stdout/0227 b/test/stdout/0227
index 9ee7e9f546d493416db99bac97438493796bbfb5..16462813a51eec5ceb06180c780b208e4a51d8cc 100644 (file)
--- a/test/stdout/0227
+++ b/test/stdout/0227
@@ -1,12 +1,15 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Called:   127.0.0.1\r
@@ -15,14 +18,17 @@
 550 Sender verify failed\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
 250 OK\r
 550 Sender verify failed\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
 250 OK\r
 550-Callback setup failed while verifying <uncheckable@localhost1>\r
 550-Called:   127.0.0.1\r
@@ -37,37 +43,60 @@
 550 Sender verify failed\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
+250 OK\r
+550 Sender verify failed\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
+250 OK\r
+451 Could not complete sender verify callout\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]\r
 250 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]\r
 250 OK\r
 550-Callout verification failed:\r
 550-550-Recipient not liked on two lines\r
 550 550 Here's the second\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]\r
+250 OK\r
+550-Callout verification failed:\r
+550 550 Recipient not liked, with bad char:(truncated)\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]\r
 250 OK\r
 451 Could not complete recipient verify callout\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.5]\r
 250 OK\r
 550 relay not permitted\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.5]\r
 250 OK\r
 550-Postmaster verification failed while checking <ok@localhost1>\r
 550-Called:   127.0.0.1\r
@@ -81,6 +110,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello root at me [V4NET.0.0.6]\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -90,6 +120,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello root at me [V4NET.0.0.3]\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -99,6 +130,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello root at me [V4NET.0.0.3]\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -108,6 +140,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello root at me [V4NET.0.0.7]\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -115,15 +148,18 @@
 550 relay not permitted\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]\r
 250 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r
 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
@@ -192,6 +228,16 @@ Connection request from [127.0.0.1]
 EHLO myhost.test.ex
 250 OK
 MAIL FROM:<>
+550 Bad-char error for <> topbitchar:\80ÿÿ
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<>
 250 OK
 RCPT TO:<z@remote.domain>
 550 Recipient not liked
@@ -218,6 +264,18 @@ EHLO myhost.test.ex
 250 OK
 MAIL FROM:<>
 250 OK
+RCPT TO:<z@remote.domain>
+550 Recipient not liked, with bad char:\80ÿÿ
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
 RCPT TO:<abcd@x.y.z>
 550 Not liked
 QUIT