Taint: reject or log more tainted list metadata elements

[exim.git] / test / stderr / 0304

diff --git a/test/stderr/0304 b/test/stderr/0304
index 159c875a1d4e3ca2d386daf500fcf35f0a5cac5b..4f1c9d89c2a62e7a86efd11e3676c9ac3ce851da 100644 (file)
--- a/test/stderr/0304
+++ b/test/stderr/0304
@@ -6,36 +6,34 @@
 >>> 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)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b1@x in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> b1@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b1@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b1@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b1@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b1@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> b1@x in "domain.only : *.domain2.only"?
@@ -48,23 +46,23 @@
 >>>   list element: *.domain2.only
 >>>  x in "*.domain2.only"? no (end of list)
 >>> b1@x in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b1@x in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> b1@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> b1@x in "pqr@@"?
 >>>  list element: pqr@@
 >>> b1@x in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>>  in ":"?
@@ -77,33 +75,33 @@
 >>>   list element: x
 >>>   x in "x"? yes (matched "x")
 >>>  b1@x in "b1@x"? yes (matched "b1@x")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b2@x in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> b2@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b2@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b2@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b2@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b2@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> b2@x in "domain.only : *.domain2.only"?
@@ -116,23 +114,23 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>>   list element: *.domain2.only
 >>>  x in "*.domain2.only"? no (end of list)
 >>> b2@x in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b2@x in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> b2@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> b2@x in "pqr@@"?
 >>>  list element: pqr@@
 >>> b2@x in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>>  in ":"?
@@ -142,8 +140,8 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>> b2@x in "b1@x"?
 >>>  list element: b1@x
 >>> b2@x in "b1@x"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>>  in "^$"?
@@ -156,33 +154,33 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>>   list element: x
 >>>   x in "x"? yes (matched "x")
 >>>  b2@x in "b2@x"? yes (matched "b2@x")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b9@x in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> b9@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b9@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b9@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> b9@x in "domain.only : *.domain2.only"?
@@ -195,23 +193,23 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>>   list element: *.domain2.only
 >>>  x in "*.domain2.only"? no (end of list)
 >>> b9@x in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b9@x in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> b9@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> b9@x in "pqr@@"?
 >>>  list element: pqr@@
 >>> b9@x in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>>  in ":"?
@@ -221,8 +219,8 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> b9@x in "b1@x"?
 >>>  list element: b1@x
 >>> b9@x in "b1@x"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>>  in "^$"?
@@ -232,8 +230,8 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> b9@x in "b2@x"?
 >>>  list element: b2@x
 >>> b9@x in "b2@x"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> b9@x in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -242,46 +240,46 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  x in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> b9@x in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> b9@x in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> b9@x in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> a@b in "^abc.*@.*\.x\.y\.z : a@b"?
@@ -291,33 +289,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
 >>>   list element: b
 >>>   b in "b"? yes (matched "b")
 >>>  a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> ok@ok in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> ok@ok in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@ok in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@ok in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> ok@ok in "domain.only : *.domain2.only"?
@@ -330,23 +328,23 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>>   list element: *.domain2.only
 >>>  ok in "*.domain2.only"? no (end of list)
 >>> ok@ok in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> ok@ok in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> ok@ok in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> ok@ok in "pqr@@"?
 >>>  list element: pqr@@
 >>> ok@ok in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -354,15 +352,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> ok@ok in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -371,84 +369,84 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  ok in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@ok in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@ok in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@ok in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@a.b.c in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> x@a.b.c in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>>  x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> abc@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>>  abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> x@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@d.e.f in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@d.e.f in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> x@d.e.f in "domain.only : *.domain2.only"?
@@ -461,23 +459,23 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>>   list element: *.domain2.only
 >>>  d.e.f in "*.domain2.only"? no (end of list)
 >>> x@d.e.f in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@d.e.f in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> x@d.e.f in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> x@d.e.f in "pqr@@"?
 >>>  list element: pqr@@
 >>> x@d.e.f in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -485,15 +483,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> x@d.e.f in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -502,123 +500,123 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  d.e.f in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@d.e.f in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@d.e.f in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@d.e.f in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> abc@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>>  abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> xyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>>  xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abcxyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> abcxyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abcxyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abcxyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>>  abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> ok@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> ok@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> ok@at.1 in "domain.only : *.domain2.only"?
@@ -631,23 +629,23 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>>   list element: *.domain2.only
 >>>  at.1 in "*.domain2.only"? no (end of list)
 >>> ok@at.1 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> ok@at.1 in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> ok@at.1 in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> ok@at.1 in "pqr@@"?
 >>>  list element: pqr@@
 >>> ok@at.1 in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -655,15 +653,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> ok@at.1 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -672,48 +670,48 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  at.1 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@at.1 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@at.1 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@at.1 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain.only in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> x@domain.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> x@domain.only in "domain.only : *.domain2.only"?
@@ -722,33 +720,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>>   list element: domain.only
 >>>   domain.only in "domain.only"? yes (matched "domain.only")
 >>>  x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@abc.domain2.only in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> x@abc.domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@abc.domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@abc.domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@abc.domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@abc.domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> x@abc.domain2.only in "domain.only : *.domain2.only"?
@@ -761,33 +759,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
 >>>   list element: *.domain2.only
 >>>   abc.domain2.only in "*.domain2.only"? yes (matched "*.domain2.only")
 >>>  x@abc.domain2.only in "domain.only : *.domain2.only"? yes (matched "*.domain2.only")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain2.only in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> x@domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> x@domain2.only in "domain.only : *.domain2.only"?
@@ -800,23 +798,23 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>>   list element: *.domain2.only
 >>>  domain2.only in "*.domain2.only"? no (end of list)
 >>> x@domain2.only in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@domain2.only in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> x@domain2.only in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> x@domain2.only in "pqr@@"?
 >>>  list element: pqr@@
 >>> x@domain2.only in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -824,15 +822,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> x@domain2.only in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -841,48 +839,48 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  domain2.only in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain2.only in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain2.only in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain2.only in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@domain3 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> abc@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> abc@domain3 in "domain.only : *.domain2.only"?
@@ -895,8 +893,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>>   list element: *.domain2.only
 >>>  domain3 in "*.domain2.only"? no (end of list)
 >>> abc@domain3 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> abc@domain3 in "abc@domain3 : xyz@*.domain4"?
@@ -905,33 +903,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>>   list element: domain3
 >>>   domain3 in "domain3"? yes (matched "domain3")
 >>>  abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> xyz@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> xyz@x.domain4 in "domain.only : *.domain2.only"?
@@ -944,8 +942,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 >>>   list element: *.domain2.only
 >>>  x.domain4 in "*.domain2.only"? no (end of list)
 >>> xyz@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"?
@@ -955,33 +953,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 >>>   list element: *.domain4
 >>>   x.domain4 in "*.domain4"? yes (matched "*.domain4")
 >>>  xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> abc@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> abc@x.domain4 in "domain.only : *.domain2.only"?
@@ -994,8 +992,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: *.domain2.only
 >>>  x.domain4 in "*.domain2.only"? no (end of list)
 >>> abc@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> abc@x.domain4 in "abc@domain3 : xyz@*.domain4"?
@@ -1005,15 +1003,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>  x.domain4 in "domain3"? no (end of list)
 >>>  list element: xyz@*.domain4
 >>> abc@x.domain4 in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> abc@x.domain4 in "pqr@@"?
 >>>  list element: pqr@@
 >>> abc@x.domain4 in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -1021,15 +1019,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> abc@x.domain4 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -1038,48 +1036,48 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  x.domain4 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@x.domain4 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@x.domain4 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@x.domain4 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@domain3 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> xyz@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> xyz@domain3 in "domain.only : *.domain2.only"?
@@ -1092,8 +1090,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: *.domain2.only
 >>>  domain3 in "*.domain2.only"? no (end of list)
 >>> xyz@domain3 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> xyz@domain3 in "abc@domain3 : xyz@*.domain4"?
@@ -1103,15 +1101,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: *.domain4
 >>>  domain3 in "*.domain4"? no (end of list)
 >>> xyz@domain3 in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> xyz@domain3 in "pqr@@"?
 >>>  list element: pqr@@
 >>> xyz@domain3 in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -1119,15 +1117,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> xyz@domain3 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -1136,8 +1134,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain3 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> xyz@domain3 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
@@ -1146,41 +1144,41 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d4
 >>>  domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> xyz@domain3 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> pqr@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> pqr@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> pqr@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> pqr@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> pqr@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> pqr@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> pqr@myhost.test.ex in "domain.only : *.domain2.only"?
@@ -1193,16 +1191,16 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: *.domain2.only
 >>>  myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> pqr@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> pqr@myhost.test.ex in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> pqr@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> pqr@myhost.test.ex in "pqr@@"?
@@ -1211,33 +1209,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>>   list element: @
 >>>   myhost.test.ex in "@"? yes (matched "@")
 >>>  pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xxx@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> xxx@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xxx@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xxx@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> xxx@myhost.test.ex in "domain.only : *.domain2.only"?
@@ -1250,23 +1248,23 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>>   list element: *.domain2.only
 >>>  myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> xxx@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> xxx@myhost.test.ex in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> xxx@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> xxx@myhost.test.ex in "pqr@@"?
 >>>  list element: pqr@@
 >>> xxx@myhost.test.ex in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -1274,15 +1272,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> xxx@myhost.test.ex in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -1291,26 +1289,26 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  myhost.test.ex in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xxx@myhost.test.ex in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> xxx@myhost.test.ex in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> xxx@myhost.test.ex in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> a@domain5 in "^abc.*@.*\.x\.y\.z : a@b"?
@@ -1320,22 +1318,22 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>>   list element: b
 >>>  domain5 in "b"? no (end of list)
 >>> a@domain5 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> a@domain5 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> a@domain5 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> a@domain5 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> a@domain5 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> a@domain5 in "domain.only : *.domain2.only"?
@@ -1348,23 +1346,23 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>>   list element: *.domain2.only
 >>>  domain5 in "*.domain2.only"? no (end of list)
 >>> a@domain5 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> a@domain5 in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> a@domain5 in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> a@domain5 in "pqr@@"?
 >>>  list element: pqr@@
 >>> a@domain5 in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -1372,15 +1370,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -1389,33 +1387,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>   domain5 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d3")
 >>>  a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@domain6 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> xyz@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> xyz@domain6 in "domain.only : *.domain2.only"?
@@ -1428,8 +1426,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>>   list element: *.domain2.only
 >>>  domain6 in "*.domain2.only"? no (end of list)
 >>> xyz@domain6 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> xyz@domain6 in "abc@domain3 : xyz@*.domain4"?
@@ -1439,15 +1437,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>>   list element: *.domain4
 >>>  domain6 in "*.domain4"? no (end of list)
 >>> xyz@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> xyz@domain6 in "pqr@@"?
 >>>  list element: pqr@@
 >>> xyz@domain6 in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -1455,15 +1453,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> xyz@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -1472,8 +1470,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
@@ -1482,33 +1480,33 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d4
 >>>   domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d4")
 >>>  xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@domain6 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> abc@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> abc@domain6 in "domain.only : *.domain2.only"?
@@ -1521,8 +1519,8 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>>   list element: *.domain2.only
 >>>  domain6 in "*.domain2.only"? no (end of list)
 >>> abc@domain6 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> abc@domain6 in "abc@domain3 : xyz@*.domain4"?
@@ -1532,15 +1530,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>>  domain6 in "domain3"? no (end of list)
 >>>  list element: xyz@*.domain4
 >>> abc@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> abc@domain6 in "pqr@@"?
 >>>  list element: pqr@@
 >>> abc@domain6 in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -1548,15 +1546,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> abc@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -1565,48 +1563,48 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "accept" (TESTSUITE/test-config 51)
->>> accept: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": ACCEPT
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "accept" (TESTSUITE/test-config 51)
+>>> accept: condition test succeeded in ACL acl1
+>>> end of ACL acl1: ACCEPT
 >>> using ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 16)
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain7 in "^abc.*@.*\.x\.y\.z : a@b"?
 >>>  list element: ^abc.*@.*\.x\.y\.z
 >>>  list element: a@b
 >>> x@domain7 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 19)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 22)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain7 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
 >>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain7 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
 >>> x@domain7 in "domain.only : *.domain2.only"?
@@ -1619,23 +1617,23 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>>   list element: *.domain2.only
 >>>  domain7 in "*.domain2.only"? no (end of list)
 >>> x@domain7 in "domain.only : *.domain2.only"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@domain7 in "abc@domain3 : xyz@*.domain4"?
 >>>  list element: abc@domain3
 >>>  list element: xyz@*.domain4
 >>> x@domain7 in "abc@domain3 : xyz@*.domain4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
 >>> x@domain7 in "pqr@@"?
 >>>  list element: pqr@@
 >>> x@domain7 in "pqr@@"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 34)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
 >>> x@y in ":"?
@@ -1643,15 +1641,15 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>>  y in ""?
 >>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 38)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
 >>> x@y in "^$"?
 >>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 42)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> x@domain7 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
@@ -1660,20 +1658,20 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
 >>>  domain7 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain7 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 45)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain7 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
 >>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain7 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
->>> deny: condition test failed in ACL "acl1"
->>> processing "deny" (TESTSUITE/test-config 48)
+>>> deny: condition test failed in ACL acl1
+>>> processing ACL acl1 "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
 >>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>>  x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
->>> deny: condition test succeeded in ACL "acl1"
->>> end of ACL "acl1": DENY
+>>> deny: condition test succeeded in ACL acl1
+>>> end of ACL acl1: DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11