Relax restrictions on which ACLs verify conditions may be used

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

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index bf77afff3cd72ef5b01466f24641c476898a0bb6..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
 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


@@ -24,7 +25,7 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@domain1
   host localhost4.test.ex [127.0.0.1]
     SMTP error from remote mail server after initial connection:
   userx@domain1
   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
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status


@@ -35,7 +36,7 @@ Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
 Remote-MTA: dns; localhost4.test.ex
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
 Remote-MTA: dns; localhost4.test.ex

-Diagnostic-Code: smtp; 550 Go away
+Diagnostic-Code: smtp; 550 Go away (A)

 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 --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
 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
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender


@@ -80,11 +82,11 @@ recipients. This is a permanent error. The following address(es) failed:
   usery@domain2
   host localhost4.test.ex [127.0.0.1]
     SMTP error from remote mail server after HELO the.local.host.name:
   usery@domain2
   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 localhost4.test.ex [127.0.0.1]
     SMTP error from remote mail server after HELO the.local.host.name:
   userx@domain1
   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
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status


@@ -95,13 +97,13 @@ Action: failed
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
 Remote-MTA: dns; localhost4.test.ex
 Final-Recipient: rfc822;userx@domain1
 Status: 5.0.0
 Remote-MTA: dns; localhost4.test.ex

-Diagnostic-Code: smtp; 550 Go away
+Diagnostic-Code: smtp; 550 Go away (C)

 
 Action: failed
 Final-Recipient: rfc822;usery@domain2
 Status: 5.0.0
 Remote-MTA: dns; localhost4.test.ex
 
 Action: failed
 Final-Recipient: rfc822;usery@domain2
 Status: 5.0.0
 Remote-MTA: dns; localhost4.test.ex

-Diagnostic-Code: smtp; 550 Go away
+Diagnostic-Code: smtp; 550 Go away (C)

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