Fix logging of drop-after-EHLO-reject.

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

diff --git a/test/mail/0309.CALLER b/test/mail/0309.CALLER
index 59aae6e4e63651101163a049c7c13fdd946c773c..b53186d4fe12f5b5707cb9dba738b753125c308e 100644 (file)
--- a/test/mail/0309.CALLER
+++ b/test/mail/0309.CALLER
@@ -8,10 +8,15 @@ X-Failed-Recipients: 1k@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@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


@@ -21,7 +26,25 @@ recipients. This is a permanent error. The following address(es) failed:
   55@myhost.test.ex
   50@myhost.test.ex
 
   55@myhost.test.ex
   50@myhost.test.ex
 

------- 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;50@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;55@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;1k@myhost.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)


@@ -53,3 +76,5 @@ This is a test message. This is a test message.
 This is a test message. This is a test message.
 This is a test message. This is a test message.
 
 This is a test message. This is a test message.
 This is a test message. This is a test message.
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+