Drop over-tight errorcheck.

[exim.git] / test / stderr / 0145

diff --git a/test/stderr/0145 b/test/stderr/0145
index 41524a026a4fb653668522585ee33de4c2b21a94..bc966a06726c80dfa8f138a426a1f403c8d3bb3b 100644 (file)
--- a/test/stderr/0145
+++ b/test/stderr/0145
@@ -6,19 +6,30 @@
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "require"
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router
+>>>  check dnssec require list
+>>>   mxt10.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   mxt10.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    mxt10.test.ex in dnssec_request_domains? yes (matched "*")
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers
 >>> ----------- end verify ------------
->>> require: condition test failed
-LOG: H=[V4NET.9.8.7] sender verify fail for <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
-LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify failed
+>>> require: condition test failed in ACL check_recipient
+>>> end of ACL check_recipient: not OK
+LOG: H=(test) [V4NET.9.8.7] sender verify fail for <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify failed
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -27,23 +38,40 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "require"
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling domainlist router
+>>>  check dnssec require list
+>>>   ten-1.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1.test.ex in dnssec_request_domains? yes (matched "*")
 >>> routed by domainlist router
 >>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "require"
+>>> require: condition test succeeded in ACL check_recipient
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 19)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router
+>>>  check dnssec require list
+>>>   mxt10.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   mxt10.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    mxt10.test.ex in dnssec_request_domains? yes (matched "*")
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers
 >>> ----------- end verify ------------
->>> require: condition test failed
-LOG: H=[V4NET.9.8.7] F=<x@ten-1.test.ex> rejected RCPT <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+>>> require: condition test failed in ACL check_recipient
+>>> end of ACL check_recipient: not OK
+LOG: H=(test) [V4NET.9.8.7] F=<x@ten-1.test.ex> rejected RCPT <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses