Merge branch 'master' into 4.next

[exim.git] / test / stderr / 4803

diff --git a/test/stderr/4803 b/test/stderr/4803
index 46a61ffbc0809f49a02ec9855a3058d2be2792ea..c22fbdc7f218f87ac2fca5dcfc783cec13e6c176 100644 (file)
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -1,42 +1,26 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of a-aa.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of a-aa.test.ex (A) succeeded
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+ DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
+ DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
+ DNS lookup of a-aa.test.ex (A) using fakens
+ DNS lookup of a-aa.test.ex (A) succeeded
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of a-sec.test.ex (A) succeeded
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+ DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
+ DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS lookup of a-sec.test.ex (A) using fakens
+ DNS lookup of a-sec.test.ex (A) succeeded
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>