Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0475

diff --git a/test/stderr/0475 b/test/stderr/0475
index e254d08f7f17535369ce04106c6b1278ec3997c8..585e78d2a961fd881a33148a8f7458c7f0909b1d 100644 (file)
--- a/test/stderr/0475
+++ b/test/stderr/0475
@@ -6,17 +6,46 @@
 >>> 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 "a1"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 17)
 >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
+>>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"?
+>>>  list element: 1.2.3.4
+>>>  list element: <;░1.2.3.4:5.6.7.8
 LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"
->>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? lookup deferred for <; 1.2.3.4:5.6.7.8
->>> deny: condition test deferred
-LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
+>>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8
+>>> deny: condition test deferred in ACL "a1"
+LOG: H=(test) [V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
 >>> using ACL "a2"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 20)
 >>> check hosts = 1.2.3/24
->>> host in "1.2.3/24"? no (malformed IPv4 address or address mask)
->>> deny: condition test failed
->>> end of ACL "a2": implicit DENY
-LOG: H=[V4NET.0.0.0] F=<> rejected RCPT <a2@b>
+>>> host in "1.2.3/24"?
+>>>  list element: 1.2.3/24
+>>>  host in "1.2.3/24"? no (malformed IPv4 address or address mask: 1.2.3)
+LOG: list matching forced to fail: malformed IPv4 address or address mask: 1.2.3
+>>>  deny: condition test failed in ACL "a2"
+>>>  end of ACL "a2": implicit DENY
+LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a2@b>
+>>>  using ACL "a3"
+>>>  processing "deny" (TESTSUITE/test-config 23)
+>>>  check hosts = <; fe80::1
+>>>  host in "<; fe80::1"?
+>>>   list element: fe80::1
+>>>  host in "<; fe80::1"? no (end of list)
+>>>  deny: condition test failed in ACL "a3"
+>>>  end of ACL "a3": implicit DENY
+LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a3@b>
+>>>  using ACL "a4"
+>>>  processing "deny" (TESTSUITE/test-config 26)
+>>>  check hosts = <; fe80:1
+>>>  host in "<; fe80:1"?
+>>>   list element: fe80:1
+>>>   host in "<; fe80:1"? no (malformed IPv6 address or address mask: fe80:1)
+LOG: list matching forced to fail: malformed IPv6 address or address mask: fe80:1
+>>>   deny: condition test failed in ACL "a4"
+>>>   end of ACL "a4": implicit DENY
+LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a4@b>