Merge branch '4.next'

[exim.git] / test / stderr / 0588

diff --git a/test/stderr/0588 b/test/stderr/0588
index cb7d945e3f4d263ee3f953b913c39a8cd184eb5c..0be237c7e9b271fe964d72aa6f0d7e3e33be759a 100644 (file)
--- a/test/stderr/0588
+++ b/test/stderr/0588
@@ -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 pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -17,9 +15,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_log@delay1500.test.ex
 >>> calling all router
->>> delay1500.test.ex in "*"?
->>>  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
@@ -34,8 +35,6 @@ 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)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -45,9 +44,12 @@ LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_not_log@delay500.test.ex
 >>> calling all router
->>> delay500.test.ex in "*"?
->>>  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 ------------