X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/897024f1b30dfde19f8ed9477c49b7cd5a1f5512..b5a5e017b07491403c7ae3a4305ecf22b0826aa5:/test/stderr/0041

diff --git a/test/stderr/0041 b/test/stderr/0041
index b323fb44d..8ffd7dbb1 100644
--- a/test/stderr/0041
+++ b/test/stderr/0041
@@ -2,22 +2,32 @@
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts?
+>>>  list element: 3.3.3.3
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>> check local_parts = hardfail
+>>> userx in "hardfail"?
+>>>  list element: hardfail
 >>> userx in "hardfail"? no (end of list)
 >>> deny: condition test failed in ACL "check_vrfy"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check local_parts = acceptable
+>>> userx in "acceptable"?
+>>>  list element: acceptable
 >>> userx in "acceptable"? no (end of list)
 >>> accept: condition test failed in ACL "check_vrfy"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check local_parts = ok_with_dom
+>>> userx in "ok_with_dom"?
+>>>  list element: ok_with_dom
 >>> userx in "ok_with_dom"? no (end of list)
 >>> accept: condition test failed in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": implicit DENY
@@ -25,7 +35,9 @@ LOG: H=[1.1.1.1] rejected VRFY userx@test.ex
 >>> using ACL "check_vrfy"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>> check local_parts = hardfail
->>> hardfail in "hardfail"? yes (matched "hardfail")
+>>> hardfail in "hardfail"?
+>>>  list element: hardfail
+>>>  hardfail in "hardfail"? yes (matched "hardfail")
 >>>   message: 599 custom reject
 >>> deny: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": DENY
@@ -33,29 +45,42 @@ LOG: H=[1.1.1.1] rejected VRFY hardfail@test.ex: 599 custom reject
 >>> using ACL "check_vrfy"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>> check local_parts = hardfail
+>>> ok_with_dom in "hardfail"?
+>>>  list element: hardfail
 >>> ok_with_dom in "hardfail"? no (end of list)
 >>> deny: condition test failed in ACL "check_vrfy"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check local_parts = acceptable
+>>> ok_with_dom in "acceptable"?
+>>>  list element: acceptable
 >>> ok_with_dom in "acceptable"? no (end of list)
 >>> accept: condition test failed in ACL "check_vrfy"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check local_parts = ok_with_dom
->>> ok_with_dom in "ok_with_dom"? yes (matched "ok_with_dom")
+>>> ok_with_dom in "ok_with_dom"?
+>>>  list element: ok_with_dom
+>>>  ok_with_dom in "ok_with_dom"? yes (matched "ok_with_dom")
 >>> check domains = test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
+>>> test.ex in "test.ex"?
+>>>  list element: test.ex
+>>>  test.ex in "test.ex"? yes (matched "test.ex")
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing ok_with_dom@test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for ok_with_dom@test.ex
->>> ok_with_dom in "userx : ok_with_dom : acceptable"? yes (matched "ok_with_dom")
+>>> ok_with_dom in local_parts?
+>>>  list element: userx
+>>>  list element: ok_with_dom
+>>>  ok_with_dom in local_parts? yes (matched "ok_with_dom")
 >>> calling localuser router
 >>> routed by localuser router
 >>> using ACL "check_expn"
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> check hosts = 2.2.2.2
+>>> host in "2.2.2.2"?
+>>>  list element: 2.2.2.2
 >>> host in "2.2.2.2"? no (end of list)
 >>> accept: condition test failed in ACL "check_expn"
 >>> end of ACL "check_expn": implicit DENY
@@ -64,41 +89,59 @@ LOG: H=[1.1.1.1] rejected EXPN postmaster
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> host in recipient_unqualified_hosts? yes (matched "3.3.3.3")
+>>> host in recipient_unqualified_hosts?
+>>>  list element: 3.3.3.3
+>>>  host in recipient_unqualified_hosts? yes (matched "3.3.3.3")
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>> check local_parts = hardfail
+>>> acceptable in "hardfail"?
+>>>  list element: hardfail
 >>> acceptable in "hardfail"? no (end of list)
 >>> deny: condition test failed in ACL "check_vrfy"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check local_parts = acceptable
->>> acceptable in "acceptable"? yes (matched "acceptable")
+>>> acceptable in "acceptable"?
+>>>  list element: acceptable
+>>>  acceptable in "acceptable"? yes (matched "acceptable")
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing acceptable@test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for acceptable@test.ex
->>> acceptable in "userx : ok_with_dom : acceptable"? yes (matched "acceptable")
+>>> acceptable in local_parts?
+>>>  list element: userx
+>>>  list element: ok_with_dom
+>>>  list element: acceptable
+>>>  acceptable in local_parts? yes (matched "acceptable")
 >>> calling localuser router
 >>> routed by localuser router
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts?
+>>>  list element: 3.3.3.3
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_expn"
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> check hosts = 2.2.2.2
->>> host in "2.2.2.2"? yes (matched "2.2.2.2")
+>>> host in "2.2.2.2"?
+>>>  list element: 2.2.2.2
+>>>  host in "2.2.2.2"? yes (matched "2.2.2.2")
 >>> accept: condition test succeeded in ACL "check_expn"
 >>> end of ACL "check_expn": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>