testsuite: abstract out common conf settings

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

diff --git a/test/stderr/0041 b/test/stderr/0041
index 0a1863aa950b7205ab4e118b959119c604ace25e..b0030521234f926e3905192581b9d0d4a09a3c11 100644 (file)
--- a/test/stderr/0041
+++ b/test/stderr/0041
@@ -7,13 +7,26 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> ACL is NULL: implicit DENY
+>>> using ACL "check_vrfy"
+>>> processing "deny"
+>>> check local_parts = hardfail
+>>> userx in "hardfail"? no (end of list)
+>>> deny: condition test failed in ACL "check_vrfy"
+>>> end of ACL "check_vrfy": implicit DENY
 LOG: H=[1.1.1.1] rejected VRFY userx@test.ex
+>>> using ACL "check_vrfy"
+>>> processing "deny"
+>>> check local_parts = hardfail
+>>> hardfail in "hardfail"? yes (matched "hardfail")
+>>>   message: 599 custom reject
+>>> deny: condition test succeeded in ACL "check_vrfy"
+>>> end of ACL "check_vrfy": DENY
+LOG: H=[1.1.1.1] rejected VRFY hardfail@test.ex: 599 custom reject
 >>> using ACL "check_expn"
 >>> processing "accept"
 >>> check hosts = 2.2.2.2
 >>> host in "2.2.2.2"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_expn"
 >>> end of ACL "check_expn": implicit DENY
 LOG: H=[1.1.1.1] rejected EXPN postmaster
 >>> host in hosts_connection_nolog? no (option unset)
@@ -29,7 +42,8 @@ LOG: H=[1.1.1.1] rejected EXPN postmaster
 >>> processing "accept"
 >>> check hosts = 2.2.2.2
 >>> host in "2.2.2.2"? yes (matched "2.2.2.2")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_expn"
+>>> end of ACL "check_expn": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list@test.ex
 >>> calling system_aliases router