Fix logging of drop-after-EHLO-reject.

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

diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index 1d70d8a0ad9b08166d2728549ff4de7363d2271c..b31f69571be956d750e409088261585c6dd87b0e 100644 (file)
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -33,7 +33,7 @@ Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
 Remote-MTA: dns; 127.0.0.1
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
 Remote-MTA: dns; 127.0.0.1

-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 450 TEMPERROR: retry timeout exceeded

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822


@@ -46,7 +46,7 @@ Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

-This is a test message.
+1:This is a test message.

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM--
 
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM--
 


@@ -85,7 +85,7 @@ Action: failed
 Final-Recipient: rfc822;userx@retry.test.ex
 Status: 5.0.0
 Remote-MTA: dns; 127.0.0.1
 Final-Recipient: rfc822;userx@retry.test.ex
 Status: 5.0.0
 Remote-MTA: dns; 127.0.0.1

-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 450 TEMPERROR: retry timeout exceeded

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822


@@ -99,7 +99,7 @@ Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

-This is a test message.
+2: This is a test message.

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM--
 
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM--
 


@@ -139,7 +139,7 @@ Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
 Remote-MTA: dns; 127.0.0.1
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
 Remote-MTA: dns; 127.0.0.1

-Diagnostic-Code: smtp; -44
+Diagnostic-Code: smtp; 450 TEMPERROR: retry timeout exceeded

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822


@@ -153,7 +153,7 @@ Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

-This is a test message.
+3: This is a test message.

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM--
 
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM--