Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0234

diff --git a/test/stderr/0234 b/test/stderr/0234
index 709f73359c4b154357a7a5b85239f6028539410c..211211964c092d45fb8863590836d9e6a7222532 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -6,8 +6,6 @@
 >>> 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 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 pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]


@@ -17,9 +15,13 @@
 >>> check domains = +relay_domains
 >>> d in "+relay_domains"?
 >>>  list element: +relay_domains
 >>> check domains = +relay_domains
 >>> d in "+relay_domains"?
 >>>  list element: +relay_domains

->>>  d in "@mx_any"?
->>>   list element: @mx_any
->>>  d in "@mx_any"? no (end of list)
+>>>   start sublist relay_domains
+>>>    d in "@mx_any"?
+>>>    ╎list element: @mx_any
+>>>    ╎check dnssec require list
+>>>    ╎check dnssec request list
+>>>    d in "@mx_any"? no (end of list)
+>>>   end sublist relay_domains

 >>> d in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>> d in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)


@@ -32,10 +34,15 @@ LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> check domains = +relay_domains
 >>> mxt1.test.ex in "+relay_domains"?
 >>>  list element: +relay_domains
 >>> check domains = +relay_domains
 >>> mxt1.test.ex in "+relay_domains"?
 >>>  list element: +relay_domains

->>>  mxt1.test.ex in "@mx_any"?
->>>   list element: @mx_any
+>>>   start sublist relay_domains
+>>>    mxt1.test.ex in "@mx_any"?
+>>>    ╎list element: @mx_any
+>>>    ╎check dnssec require list
+>>>    ╎check dnssec request list

 >>> local host has lowest MX
 >>> local host has lowest MX

->>>   mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>    ╎mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key 'mxt1.test.ex' value '@mx_any'

 >>>  mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>>  mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT


@@ -44,12 +51,17 @@ LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> check domains = +relay_domains
 >>> mxt6.test.ex in "+relay_domains"?
 >>>  list element: +relay_domains
 >>> check domains = +relay_domains
 >>> mxt6.test.ex in "+relay_domains"?
 >>>  list element: +relay_domains

->>>  mxt6.test.ex in "@mx_any"?
->>>   list element: @mx_any
+>>>   start sublist relay_domains
+>>>    mxt6.test.ex in "@mx_any"?
+>>>    ╎list element: @mx_any
+>>>    ╎check dnssec require list
+>>>    ╎check dnssec request list

 >>> local host in host list - removed hosts:
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> local host in host list - removed hosts:
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6

->>>   mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>    ╎mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key 'mxt6.test.ex' value '@mx_any'

 >>>  mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>>  mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT