X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3857519629ca8fbcf3466c3fc761a5bb6ed32d53..428af7cb289cc21f7f94643da224cf03ef3d75ea:/test/stderr/0124?ds=inline

diff --git a/test/stderr/0124 b/test/stderr/0124
index 144f84497..7e5c6e80a 100644
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -11,62 +11,71 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 20)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 21)
 >>> check domains = +local_domains
 >>> external.test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  external.test.ex in "test.ex"?
->>>   list element: test.ex
->>>  external.test.ex in "test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    external.test.ex in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    external.test.ex in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> external.test.ex in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 22)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 22)
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
->>>  host in "*.friendly.test.ex"?
->>>   list element: *.friendly.test.ex
->>> sender host name required, to match against *.friendly.test.ex
->>> looking up host name for V4NET.0.0.97
+>>>   start sublist relay_hosts
+>>>    host in "*.friendly.test.ex"?
+>>>    ╎list element: *.friendly.test.ex
+>>>    ╎sender host name required, to match against *.friendly.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
->>>   host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
+>>>    ╎host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
+>>>    end sublist relay_hosts
 >>>  host in "+relay_hosts"? no (end of list)
->>>  accept: condition test failed in ACL "check_recipient"
->>>  processing "deny" (TESTSUITE/test-config 23)
+>>>  accept: condition test failed in ACL check_recipient
+>>>  processing ACL check_recipient "deny" (TESTSUITE/test-config 23)
 >>>    message: relay not permitted
->>>  deny: condition test succeeded in ACL "check_recipient"
->>>  end of ACL "check_recipient": DENY
+>>>  deny: condition test succeeded in ACL check_recipient
+>>>  end of ACL check_recipient: DENY
 LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
 >>>  using ACL "check_recipient"
->>>  processing "accept" (TESTSUITE/test-config 20)
+>>>  processing ACL check_recipient "accept" (TESTSUITE/test-config 20)
 >>>  check hosts = :
 >>>  host in ":"?
 >>>   list element: 
 >>>  host in ":"? no (end of list)
->>>  accept: condition test failed in ACL "check_recipient"
->>>  processing "accept" (TESTSUITE/test-config 21)
+>>>  accept: condition test failed in ACL check_recipient
+>>>  processing ACL check_recipient "accept" (TESTSUITE/test-config 21)
 >>>  check domains = +local_domains
 >>>  external.test.ex in "+local_domains"?
 >>>   list element: +local_domains
->>>   external.test.ex in "test.ex"?
->>>    list element: test.ex
->>>   external.test.ex in "test.ex"? no (end of list)
+>>>    start sublist local_domains
+>>>    ╎external.test.ex in "test.ex"?
+>>>    ╎ list element: test.ex
+>>>    ╎external.test.ex in "test.ex"? no (end of list)
+>>>    end sublist local_domains
 >>>  external.test.ex in "+local_domains"? no (end of list)
->>>  accept: condition test failed in ACL "check_recipient"
->>>  processing "accept" (TESTSUITE/test-config 22)
+>>>  accept: condition test failed in ACL check_recipient
+>>>  processing ACL check_recipient "accept" (TESTSUITE/test-config 22)
 >>>  check hosts = +relay_hosts
 >>>  host in "+relay_hosts"?
 >>>   list element: +relay_hosts
+>>>    start sublist relay_hosts
+>>>   cached no match for +relay_hosts
+>>>   cached lookup data = NULL
 >>>  host in "+relay_hosts"? no (end of list)
->>>  accept: condition test failed in ACL "check_recipient"
->>>  processing "deny" (TESTSUITE/test-config 23)
+>>>  accept: condition test failed in ACL check_recipient
+>>>  processing ACL check_recipient "deny" (TESTSUITE/test-config 23)
 >>>    message: relay not permitted
->>>  deny: condition test succeeded in ACL "check_recipient"
->>>  end of ACL "check_recipient": DENY
+>>>  deny: condition test succeeded in ACL check_recipient
+>>>  end of ACL check_recipient: DENY
 LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted