X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cc5a3f43827026193110cb663151a95eac4ee379..0585799ba85d257f1e2428c1615b00c30c60931e:/test/mail/0136.forwarder?ds=inline

diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 1aa46d600..0a0f10801 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -1,15 +1,17 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-	id 10HmaZ-0005vi-00
-	for forwarder@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-000000005vi-0000
+	for forwarder@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
+References: <E10HmaX-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -34,17 +36,19 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;unknown@test.ex
+Final-Recipient: rfc822;forwarder@test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 Return-path: <abcd@x.y.z>
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <abcd@x.y.z>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+	id 10HmaX-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: abcd@x.y.z
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -54,16 +58,18 @@ Test message.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-	id 10HmbC-0005vi-00
-	for forwarder@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbC-000000005vi-0000
+	for forwarder@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
+References: <E10HmbA-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Message-Id: <E10HmbC-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -88,17 +94,19 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;unknown@test.ex
+Final-Recipient: rfc822;forwarder@test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: text/rfc822-headers
 
 Return-path: <abcd@x.y.z>
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <abcd@x.y.z>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+	id 10HmbA-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
 From: abcd@x.y.z
 Date: Tue, 2 Mar 1999 09:44:33 +0000