Expansions: better error messages for parse errors, and better debug

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

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index c863f58b59f70d57813d9375269b4bafb697b343..bf77afff3cd72ef5b01466f24641c476898a0bb6 100644 (file)
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -22,7 +22,7 @@ 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:
     550 Go away
 
     SMTP error from remote mail server after initial connection:
     550 Go away
 


@@ -34,7 +34,7 @@ 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
+Remote-MTA: dns; localhost4.test.ex

 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM


@@ -78,11 +78,11 @@ 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:
     550 Go away
   userx@domain1
     SMTP error from remote mail server after HELO the.local.host.name:
     550 Go away
   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:
     550 Go away
 
     SMTP error from remote mail server after HELO the.local.host.name:
     550 Go away
 


@@ -94,13 +94,13 @@ 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
+Remote-MTA: dns; localhost4.test.ex

 Diagnostic-Code: smtp; 550 Go away
 
 Action: failed
 Final-Recipient: rfc822;usery@domain2
 Status: 5.0.0
 Diagnostic-Code: smtp; 550 Go away
 
 Action: failed
 Final-Recipient: rfc822;usery@domain2
 Status: 5.0.0

-Remote-MTA: dns; 127.0.0.1
+Remote-MTA: dns; localhost4.test.ex

 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Diagnostic-Code: smtp; 550 Go away
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM