Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0588

diff --git a/test/stderr/0588 b/test/stderr/0588
index 89fc63a6165e4b93ffffb229aeaabbc16fbd1dc7..0be237c7e9b271fe964d72aa6f0d7e3e33be759a 100644 (file)
--- a/test/stderr/0588
+++ b/test/stderr/0588
@@ -6,17 +6,21 @@
 >>> 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)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_log@delay1500.test.ex
 >>> calling all router
->>> list element: *
->>> delay1500.test.ex in "*"? yes (matched "*")
+>>>  check dnssec require list
+>>>   delay1500.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   delay1500.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    delay1500.test.ex in dnssec_request_domains? yes (matched "*")
 LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>> local host found for non-MX address
 >>> routed by all router
@@ -31,17 +35,21 @@ LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>> 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)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_not_log@delay500.test.ex
 >>> calling all router
->>> list element: *
->>> delay500.test.ex in "*"? yes (matched "*")
+>>>  check dnssec require list
+>>>   delay500.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   delay500.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    delay500.test.ex in dnssec_request_domains? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by all router
 >>> ----------- end verify ------------