Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0469

diff --git a/test/stderr/0469 b/test/stderr/0469
index eff873f3c1a23e0877b147a2dabd126d8f9ae58d..f58711b976fad28d68b682da51975ff996e75d56 100644 (file)
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -1,9 +1,10 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
+dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -18,17 +19,25 @@ local_part=x domain=mxt1c.test.ex
 calling r1 router
 r1 router called for x@mxt1c.test.ex
   domain = mxt1c.test.ex
-DNS lookup of mxt1c.test.ex (MX) using fakens
-DNS lookup of mxt1c.test.ex (MX) succeeded
-DNS lookup of dontqualify (A) using fakens
-fakens returned PASS_ON
-passing dontqualify on to res_search()
-DNS lookup of dontqualify (A) gave HOST_NOT_FOUND
-returning DNS_NOMATCH
-fully qualified name = mxt1c.test.ex
-host_find_bydns yield = HOST_FIND_FAILED (0); returned hosts:
-  dontqualify <null> MX=1 *
+main lookup for domain
+ check dnssec require list
+  mxt1c.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  mxt1c.test.ex in dnssec_request_domains?
+   list element: *
+   mxt1c.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of mxt1c.test.ex (MX) using fakens
+ DNS lookup of mxt1c.test.ex (MX) succeeded
+ DNS lookup of dontqualify (A) using fakens
+ DNS lookup of dontqualify (A) gave NO_DATA
+ returning DNS_NODATA
+ DNS: couldn't fake dnsa len
+ DNS: no SOA record found for neg-TTL
+  writing neg-cache entry for dontqualify-A-xxxx, ttl -1
+ fully qualified name = mxt1c.test.ex
+ host_find_bydns yield = HOST_FIND_FAILED (0); returned hosts:
+   dontqualify <null> MX=1 *
 r1 router declined for x@mxt1c.test.ex
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>