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

[exim.git] / test / stdout / 0024

diff --git a/test/stdout/0024 b/test/stdout/0024
index d82af4d8cac05ba28b980fa1c0c0f33a2577906f..1cfdfcac585af71b9bf7dac6d001d26ada1edb0c 100644 (file)
--- a/test/stdout/0024
+++ b/test/stdout/0024
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello CALLER at test [V4NET.0.0.0]\r
 250 OK\r
 250 Accepted\r
 550-Verification failed for <x@y>\r
@@ -8,9 +9,10 @@
 550 Sender verify failed\r
 550 Sender verify failed\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-000000005vi-0000\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 CALLER at test [V4NET.0.0.0]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
@@ -19,18 +21,20 @@
 550 relay not permitted\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\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 CALLER at test [V4NET.255.255.0]\r
 250 OK\r
 550 unknown user\r
 550 Unrouteable address\r
 250 Accepted\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\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 CALLER at test [V4NET.11.12.13]\r
 250 OK\r
 250 Accepted\r
 550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex\r
@@ -38,17 +42,19 @@
 550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex\r
 550 This is a test blacklisting message\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmbA-000000005vi-0000\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 CALLER at test [V4NET.11.12.16]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbB-0005vi-00\r
+250 OK id=10HmbB-000000005vi-0000\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 CALLER at test\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r