Merge branch 'hs/taintwarn'

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

diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER
index d2e55b65778e5d621a5af27bdb2b22526160666d..2e62b0671ea2679afd4736d4cf681a9bb5d2f678 100644 (file)
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.CALLER
@@ -1,11 +1,13 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-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: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@myhost.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
@@ -60,7 +62,8 @@ USER=system-filter
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
-       for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for alice@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 To: alice@test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -75,7 +78,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; myhost.test.ex
 
 Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $thisaddress $1
+Final-Recipient: rfc822;system-filter
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -85,7 +88,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
-       for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for alice@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 To: alice@test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -97,11 +101,13 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-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: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@myhost.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
@@ -155,7 +161,8 @@ USER=system-filter
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
-       for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for jabberwocky@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 To: jabberwocky@test.ex
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -170,7 +177,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; myhost.test.ex
 
 Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $1
+Final-Recipient: rfc822;system-filter
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -180,7 +187,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
-       for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for jabberwocky@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 To: jabberwocky@test.ex
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -192,11 +200,13 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.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: redking@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@myhost.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
@@ -251,7 +261,8 @@ USER=redking
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
-       for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for redking@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 To: redking@test.ex
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -266,7 +277,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; myhost.test.ex
 
 Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $thisaddress $1
+Final-Recipient: rfc822;redking@test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -276,7 +287,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
-       for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for redking@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 To: redking@test.ex
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>