Fix recipient (or source) selection in combination with periodic queue run. Bug 3064

[exim.git] / test / mail / 0136.forwarder

diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 9d74ba75ee657b7f7e42baa4e2abeb8ea4c1ec69..0a0f10801324be81af674fba082740ae5f656189 100644 (file)
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -1,15 +1,22 @@
 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
+Content-type: text/plain; charset=us-ascii
+
 This message was created automatically by mail delivery software.
 
 A message sent by
@@ -23,30 +30,51 @@ address(es) failed:
     (generated from forwarder@test.ex)
     Address unknown (:fail:)
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+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
 
 Test message.
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 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
+Content-type: text/plain; charset=us-ascii
+
 This message was created automatically by mail delivery software.
 
 A message sent by
@@ -60,14 +88,28 @@ address(es) failed:
     (generated from forwarder@test.ex)
     Address unknown (:fail:)
 
------- This is a copy of the message's headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+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
 
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+