X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..481e63ca2bbd7b603e5bb84f6582ab4be5e3300d:/test/stderr/0281?ds=sidebyside

diff --git a/test/stderr/0281 b/test/stderr/0281
index 084f156d5..5c58bd3af 100644
--- a/test/stderr/0281
+++ b/test/stderr/0281
@@ -7,45 +7,56 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_1"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 19)
+>>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
 >>> myhost.test.ex in "@ : @[]"? yes (matched "@")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_1"
+>>> processing "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test succeeded in ACL "acl_rcpt_1"
+>>> end of ACL "acl_rcpt_1": ACCEPT
 >>> using ACL "acl_rcpt_1"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 19)
+>>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
 >>> [127.0.0.1] in "@ : @[]"? yes (matched "@[]")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_1"
+>>> processing "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test succeeded in ACL "acl_rcpt_1"
+>>> end of ACL "acl_rcpt_1": ACCEPT
 >>> using ACL "acl_rcpt_1"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 19)
+>>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
 >>> else.where in "@ : @[]"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_1"
+>>> end of ACL "acl_rcpt_1": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match @ or @[]
 >>> using ACL "acl_rcpt_2"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 24)
+>>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
 >>> other1.test.ex in hosts_treat_as_local? yes (matched "other1.test.ex")
 >>> local host has lowest MX
 >>> mxt13.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_2"
+>>> processing "accept" (TESTSUITE/test-config 26)
+>>> accept: condition test succeeded in ACL "acl_rcpt_2"
+>>> end of ACL "acl_rcpt_2": ACCEPT
 >>> using ACL "acl_rcpt_2"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 24)
+>>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
 >>> mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_2"
+>>> processing "accept" (TESTSUITE/test-config 26)
+>>> accept: condition test succeeded in ACL "acl_rcpt_2"
+>>> end of ACL "acl_rcpt_2": ACCEPT
 >>> using ACL "acl_rcpt_2"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 24)
+>>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
@@ -53,102 +64,128 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>> mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_2"
+>>> processing "accept" (TESTSUITE/test-config 26)
+>>> accept: condition test succeeded in ACL "acl_rcpt_2"
+>>> end of ACL "acl_rcpt_2": ACCEPT
 >>> using ACL "acl_rcpt_2"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 24)
+>>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-3.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt9.test.ex in "@mx_any"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_2"
+>>> end of ACL "acl_rcpt_2": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_2"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 24)
+>>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
 >>> mxnone.test.ex in "@mx_any"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_2"
+>>> end of ACL "acl_rcpt_2": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_3"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 29)
+>>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
+>>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
 >>> mxt5.test.ex in "@mx_primary"? yes (matched "@mx_primary")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_3"
+>>> processing "accept" (TESTSUITE/test-config 31)
+>>> accept: condition test succeeded in ACL "acl_rcpt_3"
+>>> end of ACL "acl_rcpt_3": ACCEPT
 >>> using ACL "acl_rcpt_3"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 29)
+>>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>>   ten-2.test.ex V4NET.0.0.2 6
+>>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt6.test.ex in "@mx_primary"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_3"
+>>> end of ACL "acl_rcpt_3": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 29)
+>>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-3.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt9.test.ex in "@mx_primary"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_3"
+>>> end of ACL "acl_rcpt_3": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 29)
+>>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
 >>> mxnone.test.ex in "@mx_primary"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_3"
+>>> end of ACL "acl_rcpt_3": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_4"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 34)
+>>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
 >>> mxt5.test.ex in "@mx_secondary"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_4"
+>>> end of ACL "acl_rcpt_4": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 34)
+>>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>>   ten-2.test.ex V4NET.0.0.2 6
+>>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt6.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_4"
+>>> processing "accept" (TESTSUITE/test-config 36)
+>>> accept: condition test succeeded in ACL "acl_rcpt_4"
+>>> end of ACL "acl_rcpt_4": ACCEPT
 >>> using ACL "acl_rcpt_4"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 34)
+>>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-3.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt9.test.ex in "@mx_secondary"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_4"
+>>> end of ACL "acl_rcpt_4": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 34)
+>>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
 >>> mxnone.test.ex in "@mx_secondary"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_4"
+>>> end of ACL "acl_rcpt_4": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_5"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 39)
+>>>   message: host doesn't match @ or @[]
 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
 >>> host in "@ : @[]"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_5"
+>>> end of ACL "acl_rcpt_5": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't match @ or @[]
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -159,15 +196,17 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't matc
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_5"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 39)
+>>>   message: host doesn't match @ or @[]
 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
 >>> host in "@ : @[]"? yes (matched "@")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_5"
+>>> processing "accept" (TESTSUITE/test-config 41)
+>>> accept: condition test succeeded in ACL "acl_rcpt_5"
+>>> end of ACL "acl_rcpt_5": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -177,15 +216,17 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_5"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 39)
+>>>   message: host doesn't match @ or @[]
 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
 >>> host in "@ : @[]"? yes (matched "@[]")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_5"
+>>> processing "accept" (TESTSUITE/test-config 41)
+>>> accept: condition test succeeded in ACL "acl_rcpt_5"
+>>> end of ACL "acl_rcpt_5": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -195,34 +236,40 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_2"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 24)
+>>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt3.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_2"
+>>> processing "accept" (TESTSUITE/test-config 26)
+>>> accept: condition test succeeded in ACL "acl_rcpt_2"
+>>> end of ACL "acl_rcpt_2": ACCEPT
 >>> using ACL "acl_rcpt_3"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 29)
+>>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt3.test.ex in "@mx_primary"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_3"
+>>> end of ACL "acl_rcpt_3": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_4"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 34)
+>>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt3.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_4"
+>>> processing "accept" (TESTSUITE/test-config 36)
+>>> accept: condition test succeeded in ACL "acl_rcpt_4"
+>>> end of ACL "acl_rcpt_4": ACCEPT