Call notquite ACL for synprot-error limit. Bug 3092

[exim.git] / test / stderr / 0145

diff --git a/test/stderr/0145 b/test/stderr/0145
index bf097166d934cb221b0f7818bb6b289bf6c6f63a..bc966a06726c80dfa8f138a426a1f403c8d3bb3b 100644 (file)
--- a/test/stderr/0145
+++ b/test/stderr/0145
@@ -11,21 +11,23 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"

->>> processing "require" (TESTSUITE/test-config 18)
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 18)

 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router

->>> mxt10.test.ex in dnssec_require_domains? no (option unset)
->>> mxt10.test.ex in dnssec_request_domains?
->>>  list element: *
->>>  mxt10.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  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 ------------
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers
 >>> ----------- end verify ------------

->>> require: condition test failed in ACL "check_recipient"
->>> end of ACL "check_recipient": not OK
+>>> 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)
 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)


@@ -41,31 +43,35 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender veri
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"

->>> processing "require" (TESTSUITE/test-config 18)
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 18)

 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling domainlist router
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling domainlist router

->>> ten-1.test.ex in dnssec_require_domains? no (option unset)
->>> ten-1.test.ex in dnssec_request_domains?
->>>  list element: *
->>>  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  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 ------------
 >>> routed by domainlist router
 >>> ----------- end verify ------------

->>> require: condition test succeeded in ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 19)
+>>> 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 verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router

->>> mxt10.test.ex in dnssec_require_domains? no (option unset)
->>> mxt10.test.ex in dnssec_request_domains?
->>>  list element: *
->>>  mxt10.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  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 ------------
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers
 >>> ----------- end verify ------------

->>> require: condition test failed in ACL "check_recipient"
->>> end of ACL "check_recipient": not OK
+>>> 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
 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