Log: more info in ACL "warn statement skipped" message. Bug 2897

[exim.git] / test / stderr / 0077

diff --git a/test/stderr/0077 b/test/stderr/0077
index 5eb31ed0145d1029c65ae8713af5d4b6be21a0f1..0a56283da66fb296fcc99ee868027cb3e733ebf1 100644 (file)
--- a/test/stderr/0077
+++ b/test/stderr/0077
@@ -11,7 +11,7 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 18)
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 >>> host in "! @ : ! localhost"?
 >>>  list element: !░@
@@ -23,8 +23,8 @@ 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 in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
@@ -35,8 +35,8 @@ MUNGED: ::1 will be omitted in what follows
 >>>   end sublist local_domains
 >>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> 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)
@@ -50,7 +50,7 @@ MUNGED: ::1 will be omitted in what follows
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 18)
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 >>> host in "! @ : ! localhost"?
 >>>  list element: !░@
@@ -58,8 +58,8 @@ 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 in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
@@ -70,8 +70,8 @@ MUNGED: ::1 will be omitted in what follows
 >>>   end sublist local_domains
 >>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> 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)
@@ -85,7 +85,7 @@ MUNGED: ::1 will be omitted in what follows
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 18)
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 >>> host in "! @ : ! localhost"?
 >>>  list element: !░@
@@ -97,6 +97,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 in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>> 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>