Merge branch 'master' into 4.next

[exim.git] / test / stderr / 1002

diff --git a/test/stderr/1002 b/test/stderr/1002
index c1a59fded5375c85eaa05710f2cda0100cf1dc4f..7dba773b5fab254f230b8e5d1d9ef2ef4c02eda9 100644 (file)
--- a/test/stderr/1002
+++ b/test/stderr/1002
@@ -6,20 +6,45 @@
 >>> 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 "acl_rcpt_1"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 19)
+>>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
->>> [::1] in "@ : @[]"? yes (matched "@[]")
+>>> [::1] in "@ : @[]"?
+>>>  list element: @
+>>>  list element: @[]
+>>>  [::1] in "@ : @[]"? yes (matched "@[]")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"
->>> processing "accept"
+>>> 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_6"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 44)
+>>>   message: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
 >>> check domains = <+ @mx_any/ignore=<;127.0.0.1;::1
->>> ::1 in "<;127.0.0.1;::1"? yes (matched "::1")
->>> 127.0.0.1 in "<;127.0.0.1;::1"? yes (matched "127.0.0.1")
->>> V4NET.0.0.1 in "<;127.0.0.1;::1"? no (end of list)
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"?
+>>>  list element: @mx_any/ignore=<;127.0.0.1;::1
+>>>  check dnssec require list
+>>>  check dnssec request list
+>>>  ::1 in "<;127.0.0.1;::1"?
+>>>   list element: 127.0.0.1
+>>>   list element: ::1
+>>>   ::1 in "<;127.0.0.1;::1"? yes (matched "::1")
+>>>  127.0.0.1 in "<;127.0.0.1;::1"?
+>>>   list element: 127.0.0.1
+>>>   127.0.0.1 in "<;127.0.0.1;::1"? yes (matched "127.0.0.1")
+>>>  V4NET.0.0.1 in "<;127.0.0.1;::1"?
+>>>   list element: 127.0.0.1
+>>>   list element: ::1
+>>>  V4NET.0.0.1 in "<;127.0.0.1;::1"? no (end of list)
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_6"
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
+>>> end of ACL "acl_rcpt_6": not OK
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1