Fix logging of delivery port for callout lazy-close, when port specified by router

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

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index ab4609464dcb40a1c6f2e4e7e2b97add5df53a95..12511cd7338ed03ccfa7387b3ec15322c6c1c1bb 100644 (file)
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -22,9 +22,9 @@ 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:
 
   userx@domain1
 recipients. This is a permanent error. The following address(es) failed:
 
   userx@domain1

-  host 127.0.0.1 [127.0.0.1]
+  host localhost4.test.ex [127.0.0.1]

     SMTP error from remote mail server after initial connection:
     SMTP error from remote mail server after initial connection:

-    550 Go away
+    550 Go away (A)

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status


@@ -34,8 +34,8 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
 Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0

-Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Remote-MTA: dns; localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away (A)

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


@@ -78,13 +78,13 @@ 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:
 
   usery@domain2
 recipients. This is a permanent error. The following address(es) failed:
 
   usery@domain2

-  host 127.0.0.1 [127.0.0.1]
+  host localhost4.test.ex [127.0.0.1]

     SMTP error from remote mail server after HELO the.local.host.name:
     SMTP error from remote mail server after HELO the.local.host.name:

-    550 Go away
+    550 Go away (C)

   userx@domain1
   userx@domain1

-  host 127.0.0.1 [127.0.0.1]
+  host localhost4.test.ex [127.0.0.1]

     SMTP error from remote mail server after HELO the.local.host.name:
     SMTP error from remote mail server after HELO the.local.host.name:

-    550 Go away
+    550 Go away (C)

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status


@@ -94,13 +94,14 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
 Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0

-Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Remote-MTA: dns; localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away (C)
+

 Action: failed
 Final-Recipient: rfc822;usery@domain2
 Status: 5.0.0
 Action: failed
 Final-Recipient: rfc822;usery@domain2
 Status: 5.0.0

-Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Remote-MTA: dns; localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away (C)

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