Put back a required .new/.wen stanza

[users/heiko/exim.git] / test / stderr / 0026

diff --git a/test/stderr/0026 b/test/stderr/0026
index 5020f18acc2a2c0a103d7d26b03d74eda6bdd8e2..c33875c88452f53c97117e2b79394a339813c2c6 100644 (file)
--- a/test/stderr/0026
+++ b/test/stderr/0026
@@ -7,17 +7,17 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> processing "accept"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> processing "accept"

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

 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"
 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = no
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"
 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = no

->>> deny: condition test failed
+>>> deny: condition test failed in ACL "acl_data"

 >>> processing "require"
 >>> check verify = header_syntax
 >>> processing "require"
 >>> check verify = header_syntax

->>> require: condition test failed
-LOG: 10HmbF-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
+>>> require: condition test failed in ACL "acl_data"
+LOG: 10HmbH-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -27,11 +27,11 @@ LOG: 10HmbF-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> processing "accept"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> processing "accept"

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

 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"
 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = yes
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"
 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = yes

->>> deny: condition test succeeded
-LOG: 10HmbG-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: body contains trigger
+>>> deny: condition test succeeded in ACL "acl_data"
+LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: body contains trigger