Fix string_copy() macro to not multiple-eval args. Bug 2603

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

diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index b050907324e5c21e3af4ca2b5eaa05e0f6dd2550..ee6af38b3711c843d403564f9f06a1ab2c021b0b 100644 (file)
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: bounce@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 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
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender


@@ -35,11 +36,11 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed

-Final-Recipient: rfc822;hbounce@test.ex
+Final-Recipient: rfc822;useryx@test.ex

 Status: 5.0.0
 
 Action: failed
 Status: 5.0.0
 
 Action: failed

-Final-Recipient: rfc822;bounce@test.ex
+Final-Recipient: rfc822;userxx@test.ex

 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM


@@ -67,6 +68,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 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: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes


@@ -105,15 +107,15 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed

-Final-Recipient: rfc822;/no/such/file
+Final-Recipient: rfc822;file@test.ex

 Status: 4.0.0
 
 Action: delayed
 Status: 4.0.0
 
 Action: delayed

-Final-Recipient: rfc822;defer@test.ex
+Final-Recipient: rfc822;userxy@test.ex

 Status: 4.0.0
 
 Action: delayed
 Status: 4.0.0
 
 Action: delayed

-Final-Recipient: rfc822;hdefer@test.ex
+Final-Recipient: rfc822;useryy@test.ex

 Status: 4.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Status: 4.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM