tidying

[exim.git] / test / stderr / 0077

diff --git a/test/stderr/0077 b/test/stderr/0077
index da5053a6c729d4ffcbee907a5e9dcc906fd37606..a0128bd9f443d09857be567e29fdfe63d83a40c6 100644 (file)
--- a/test/stderr/0077
+++ b/test/stderr/0077
@@ -6,8 +6,9 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
@@ -16,12 +17,13 @@ MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 >>> host in "! @ : ! localhost"? no (matched "! localhost")
->>> deny: condition test failed
->>> processing "accept"
+>>> deny: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -30,19 +32,21 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
 >>> host in "! @ : ! localhost"? no (matched "! @")
->>> deny: condition test failed
->>> processing "accept"
+>>> deny: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -51,8 +55,9 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
@@ -61,5 +66,6 @@ MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 >>> host in "! @ : ! localhost"? yes (end of list)
->>> deny: condition test succeeded
-LOG: H=[V4NET.0.0.1] F=<x@test.ex> rejected RCPT <x@test.ex>
+>>> deny: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": DENY
+LOG: H=(test) [V4NET.0.0.1] F=<x@test.ex> rejected RCPT <x@test.ex>