Use dedicated union member for option offsets

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

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index 89eadf58d2601acb9c8839ecbeaf3d466b21da55..1501b9140bbbee9046e73b395e92f3d6a564eaad 100644 (file)
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -7,6 +7,7 @@ X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -22,9 +23,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
-  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
+    550 Go away (A)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
@@ -34,8 +35,8 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
-Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 550 Go away
+Remote-MTA: dns; localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away (A)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -63,6 +64,7 @@ X-Failed-Recipients: usery@domain2,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -78,13 +80,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
-  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
+    550 Go away (C)
   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
+    550 Go away (C)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
@@ -94,13 +96,14 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
-Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 550 Go away
+Remote-MTA: dns; localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away (C)
+
 Action: failed
 Final-Recipient: rfc822;usery@domain2
 Status: 5.0.0
-Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 550 Go away
+Remote-MTA: dns; localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away (C)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822