git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hs/taintwarn'
[exim.git]
/
test
/
mail
/
0383.CALLER
diff --git
a/test/mail/0383.CALLER
b/test/mail/0383.CALLER
index e54e474fa51288360aed7ba01b274475e5d63621..2e62b0671ea2679afd4736d4cf681a9bb5d2f678 100644
(file)
--- a/
test/mail/0383.CALLER
+++ b/
test/mail/0383.CALLER
@@
-1,15
+1,22
@@
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
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
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
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@myhost.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
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
@@
-55,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
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>
To: alice@test.ex
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@test.ex>
@@
-64,31
+72,51
@@
Date: Tue, 2 Mar 1999 09:44:33 +0000
------------------
------------------
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;system-filter
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
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
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>
Date: 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>
Date: Tue, 2 Mar 1999 09:44:33 +0000
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
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
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
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
Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbA-0005vi-00@myhost.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
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
@@
-133,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
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>
To: jabberwocky@test.ex
Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@test.ex>
@@
-142,31
+171,51
@@
Date: Tue, 2 Mar 1999 09:44:33 +0000
------------------
------------------
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;system-filter
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
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
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>
Date: 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>
Date: Tue, 2 Mar 1999 09:44:33 +0000
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
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
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
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
Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbC-0005vi-00@myhost.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
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
@@
-212,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
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>
To: redking@test.ex
Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@test.ex>
@@
-221,16
+271,29
@@
Date: Tue, 2 Mar 1999 09:44:33 +0000
------------------
------------------
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;redking@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
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
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>
Date: 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>
Date: Tue, 2 Mar 1999 09:44:33 +0000
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+