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

[exim.git] / test / stdout / 0389

diff --git a/test/stdout/0389 b/test/stdout/0389
index b361850cf8e3b7f7cd1edd7e88248e9befa99e9c..dabe1d368c1e66d8e3fd0637c1b56ceec54d4c28 100644 (file)
--- a/test/stdout/0389
+++ b/test/stdout/0389
@@ -1,18 +1,23 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\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
 221 myhost.test.ex closing connection\r

-10HmaX-0005vi-00-H
+10HmaX-000000005vi-0000-H

 CALLER UID GID
 <CALLER@myhost.test.ex>
 ddddddddd 0
 CALLER UID GID
 <CALLER@myhost.test.ex>
 ddddddddd 0

+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name test

 -ident CALLER
 -received_protocol local-smtp
 -aclm 0 22
 >Sender verify failed<
 -body_linecount 0
 -ident CALLER
 -received_protocol local-smtp
 -aclm 0 22
 >Sender verify failed<
 -body_linecount 0

+-max_received_linelength 0

 -auth_id CALLER
 -allow_unqualified_recipient
 -allow_unqualified_sender
 -auth_id CALLER
 -allow_unqualified_recipient
 -allow_unqualified_sender


@@ -22,10 +27,12 @@ XX
 1
 x@y
 
 1
 x@y
 

-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaX-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+       id 10HmaX-000000005vi-0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
+054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000