Taint: reject or log more tainted list metadata elements

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

diff --git a/test/mail/4161.CALLER b/test/mail/4161.CALLER
index 50d4a66cd1d414523068c32baba8702c360b0198..0a5899bfb9546ebfd1f062e71b691ae99fd48d26 100644 (file)
--- a/test/mail/4161.CALLER
+++ b/test/mail/4161.CALLER
@@ -1,77 +1,37 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-Return-path: <>
-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-000000005vi-0000
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmaY-000000005vi-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-000000005vi-0000@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
-Message-Id: <E10HmbC-000000005vi-0000@mail.test.ex>
-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 that you sent could not be delivered to one or more of its
-recipients. This is a permanent error. The following address(es) failed:
-
-  save to userx-extra
-    generated by restrict-userx@test.ex
-
---NNNNNNNNNN-eximdsn-MMMMMMMMMM
-Content-type: message/delivery-status
-
-Reporting-MTA: dns; mail.test.ex
-
-Action: failed
-Final-Recipient: rfc822;restrict-userx@test.ex
-Status: 5.0.0
-
---NNNNNNNNNN-eximdsn-MMMMMMMMMM
-Content-type: message/rfc822
-
-Return-path: <CALLER@test.ex>
-Received: from CALLER by mail.test.ex with local (Exim x.yz)
-       (envelope-from <CALLER@test.ex>)
-       id 10HmbB-000000005vi-0000
-       for restrict-userx@test.ex;
-       Tue, 2 Mar 1999 09:44:33 +0000
-Filter: require "fileinto"; fileinto "userx-extra";
-Message-Id: <E10HmbB-000000005vi-0000@mail.test.ex>
+Subject: Auto generated
+In-Reply-To: <E10HmaX-000000005vi-0000@myhost.test.ex>
+References: <E10HmaX-000000005vi-0000@myhost.test.ex>
+Auto-Submitted: auto-replied
+h1: the first added header
+h2: the second added header
+ continued on another line
+h3: the third added header
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Test 5
-
---NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+This is some body text
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-Return-path: <>
-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-000000005vi-0000
+Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbA-000000005vi-0000
        for CALLER@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-X-Failed-Recipients: restrict-userx@test.ex
+X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
-References: <E10HmbD-000000005vi-0000@mail.test.ex>
+References: <E10HmaZ-000000005vi-0000@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
-Message-Id: <E10HmbE-000000005vi-0000@mail.test.ex>
+Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -82,33 +42,33 @@ This message was created automatically by mail delivery software.
 A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
-  save to inbox
-    generated by restrict-userx@test.ex
+  userx@test.ex
+    retry timeout exceeded
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
 
-Reporting-MTA: dns; mail.test.ex
+Reporting-MTA: dns; myhost.test.ex
 
 Action: failed
-Final-Recipient: rfc822;restrict-userx@test.ex
+Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 Return-path: <CALLER@test.ex>
-Received: from CALLER by mail.test.ex with local (Exim x.yz)
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbD-000000005vi-0000
-       for restrict-userx@test.ex;
+       id 10HmaZ-000000005vi-0000
+       for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Filter: fileinto "userx-extra";
-Message-Id: <E10HmbD-000000005vi-0000@mail.test.ex>
+fno: 2
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Test 6
+Another message 
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM--