Use table for scanner name and default args

[users/jgh/exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index 4c84b14539f234e3fd22248847406d27a6531c59..070227068e040893d96a2c6dd691ee6d5150952e 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -51,7 +51,7 @@ SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in inline ACL

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself


@@ -75,7 +75,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax

-accept: condition test succeeded
+accept: condition test succeeded in ACL "check_data"

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file


@@ -113,7 +113,7 @@ SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in inline ACL

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself


@@ -137,7 +137,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax

-accept: condition test failed
+accept: condition test failed in ACL "check_data"

 end of ACL "check_data": implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
 end of ACL "check_data": implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT