git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: munge for WITH_LOCAL_SCAN
[users/jgh/exim.git]
/
test
/
mail
/
0051.CALLER
diff --git
a/test/mail/0051.CALLER
b/test/mail/0051.CALLER
index 04882a83de535580f0ff1de2b5b2ffa89d81e90f..d7931d7c2dc01d70e5503a2c0b65cefa4ccbaf9b 100644
(file)
--- a/
test/mail/0051.CALLER
+++ b/
test/mail/0051.CALLER
@@
-5,13
+5,19
@@
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmaZ-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmaZ-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
X-Failed-Recipients: userx@bad.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
X-Failed-Recipients: userx@bad.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
+References: <E10HmaY-0005vi-00@myhost.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
Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaZ-0005vi-00@myhost.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.
This message was created automatically by mail delivery software.
@@
-21,19
+27,31
@@
recipients. This is a permanent error. The following address(es) failed:
userx@bad.ex
Unrouteable address
userx@bad.ex
Unrouteable address
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@bad.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmaY-0005vi-00
for userx@bad.ex; Tue, 2 Mar 1999 09:44:33 +0000
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmaY-0005vi-00
for userx@bad.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaY-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
Message-Id: <E10HmaY-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
This is a test message 2.
This is a test message 2.
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@myhost.ex
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@myhost.ex
@@
-41,13
+59,19
@@
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmbB-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmbB-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.ex>
X-Failed-Recipients: userx@badbad.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
X-Failed-Recipients: userx@badbad.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
+References: <E10HmbA-0005vi-00@myhost.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
Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbB-0005vi-00@myhost.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.
This message was created automatically by mail delivery software.
@@
-57,19
+81,31
@@
recipients. This is a permanent error. The following address(es) failed:
userx@badbad.ex
unrouteable mail domain "badbad.ex" (:fail:)
userx@badbad.ex
unrouteable mail domain "badbad.ex" (:fail:)
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@badbad.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmbA-0005vi-00
for userx@badbad.ex; Tue, 2 Mar 1999 09:44:33 +0000
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmbA-0005vi-00
for userx@badbad.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbA-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
Message-Id: <E10HmbA-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
This is a test message 3.
This is a test message 3.
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@myhost.ex
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@myhost.ex
@@
-77,13
+113,19
@@
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmbE-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmbE-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
X-Failed-Recipients: userx@domain4.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
X-Failed-Recipients: userx@domain4.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
+References: <E10HmbD-0005vi-00@myhost.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
Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbE-0005vi-00@myhost.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.
This message was created automatically by mail delivery software.
@@
-93,19
+135,31
@@
recipients. This is a permanent error. The following address(es) failed:
userx@domain4.ex
Unrouteable address
userx@domain4.ex
Unrouteable address
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@domain4.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmbD-0005vi-00
for userx@domain4.ex; Tue, 2 Mar 1999 09:44:33 +0000
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmbD-0005vi-00
for userx@domain4.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbD-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
Message-Id: <E10HmbD-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
This is a test message 5.
This is a test message 5.
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@myhost.ex
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@myhost.ex
@@
-113,13
+167,19
@@
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmbG-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
id 10HmbG-0005vi-00
for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
X-Failed-Recipients: userx@domain2.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
X-Failed-Recipients: userx@domain2.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@myhost.ex>
To: CALLER@myhost.ex
+References: <E10HmbF-0005vi-00@myhost.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
Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbG-0005vi-00@myhost.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.
This message was created automatically by mail delivery software.
@@
-129,16
+189,28
@@
recipients. This is a permanent error. The following address(es) failed:
userx@domain2.ex
unrouteable mail domain "domain2.ex" (:fail:)
userx@domain2.ex
unrouteable mail domain "domain2.ex" (:fail:)
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@domain2.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmbF-0005vi-00
for userx@domain2.ex; Tue, 2 Mar 1999 09:44:33 +0000
Return-path: <CALLER@myhost.ex>
Received: from CALLER by myhost.ex with local (Exim x.yz)
(envelope-from <CALLER@myhost.ex>)
id 10HmbF-0005vi-00
for userx@domain2.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbF-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
Message-Id: <E10HmbF-0005vi-00@myhost.ex>
From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
This is a test message 6.
This is a test message 6.
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+