refactor

[exim.git] / test / mail / 0428.CALLER

diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index ff0af0de3d34635df6c5b046992f655e07d84f6b..77092372860a7cf9885c20fe7b350df55954d375 100644 (file)
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -4,11 +4,13 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@mail.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -32,7 +34,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; mail.test.ex
 
 Action: failed
-Final-Recipient: rfc822;userx-extra
+Final-Recipient: rfc822;restrict-userx@test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -42,7 +44,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
-       for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for restrict-userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Filter: require "fileinto"; fileinto "userx-extra";
 Message-Id: <E10HmbB-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -58,11 +61,13 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
        id 10HmbE-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-0005vi-00@mail.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -86,7 +91,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; mail.test.ex
 
 Action: failed
-Final-Recipient: rfc822;inbox
+Final-Recipient: rfc822;restrict-userx@test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -96,7 +101,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
-       for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for restrict-userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Filter: fileinto "userx-extra";
 Message-Id: <E10HmbD-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>