Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0499

diff --git a/test/stderr/0499 b/test/stderr/0499
index 6257f319f679fc5d4cc6120e58c5ebb891760ee9..ebc043e8e213005b65a6b3dc57e6807cbacd70e0 100644 (file)
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -1,22 +1,7 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -32,34 +17,42 @@ routing ph@mxt1.test.ex
 --------> r1 router <--------
 local_part=ph domain=mxt1.test.ex
 checking domains
-list element: +anymx
- start sublist anymx
-  list element: @mx_any
-DNS lookup of mxt1.test.ex (MX) using fakens
-DNS lookup of mxt1.test.ex (MX) succeeded
-DNS lookup of eximtesthost.test.ex (A) using fakens
-DNS lookup of eximtesthost.test.ex (A) succeeded
-local host has lowest MX
-host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
-  eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
-  mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
- end sublist anymx
-data from lookup saved for cache for +anymx: key 'mxt1.test.ex' value '@mx_any'
-mxt1.test.ex in "+anymx"? yes (matched "+anymx")
-checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...
+mxt1.test.ex in domains?
  list element: +anymx
   start sublist anymx
-   list element: @mx_any
-DNS lookup of mxt1.test.ex (MX) using fakens
-DNS lookup of mxt1.test.ex (MX) succeeded
-DNS lookup of eximtesthost.test.ex (A) using fakens
-DNS lookup of eximtesthost.test.ex (A) succeeded
+   mxt1.test.ex in "@mx_any"?
+   ╎list element: @mx_any
+   ╎check dnssec require list
+   ╎check dnssec request list
+   ╎DNS lookup of mxt1.test.ex (MX) using fakens
+   ╎DNS lookup of mxt1.test.ex (MX) succeeded
+   ╎DNS lookup of eximtesthost.test.ex (A) using fakens
+   ╎DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX
-host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
-  eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
-   mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+   ╎host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
+   ╎  eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
+   ╎mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
   end sublist anymx
- mxt1.test.ex in "+anymx"? yes (matched "+anymx")
+ data from lookup saved for cache for +anymx: key 'mxt1.test.ex' value '@mx_any'
+ mxt1.test.ex in domains? yes (matched "+anymx")
+checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...
+ mxt1.test.ex in "+anymx"?
+  list element: +anymx
+   start sublist anymx
+   ╎mxt1.test.ex in "@mx_any"?
+   ╎ list element: @mx_any
+   ╎ check dnssec require list
+   ╎ check dnssec request list
+   ╎ DNS lookup of mxt1.test.ex (MX) using fakens
+   ╎ DNS lookup of mxt1.test.ex (MX) succeeded
+   ╎ DNS lookup of eximtesthost.test.ex (A) using fakens
+   ╎ DNS lookup of eximtesthost.test.ex (A) succeeded
+local host has lowest MX
+   ╎ host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
+   ╎   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
+   ╎ mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+   end sublist anymx
+  mxt1.test.ex in "+anymx"? yes (matched "+anymx")
 calling r1 router
 r1 router called for ph@mxt1.test.ex
   domain = mxt1.test.ex