Merge branch '4.next'

[exim.git] / test / stderr / 0278

diff --git a/test/stderr/0278 b/test/stderr/0278
index 30538f4f4a41676da21a251b7f552e09187cf96f..e0a55a4d82217eca5dd91bbf6433c665ceec2cdc 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
@@ -90,6 +91,7 @@ routed by r3 router
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 configuration file is TESTSUITE/test-config
@@ -138,6 +140,7 @@ created log directory TESTSUITE/spool/log
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1236
 configuration file is TESTSUITE/test-config
@@ -161,8 +164,6 @@ body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   CALLER@test.ex 
- locking TESTSUITE/spool/db/retry.lockfile
- locked  TESTSUITE/spool/db/retry.lockfile
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
  returned from EXIM_DBOPEN: (nil)
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
@@ -257,8 +258,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> CALLER@test.ex <--------
- locking TESTSUITE/spool/db/retry.lockfile
- locked  TESTSUITE/spool/db/retry.lockfile
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
  returned from EXIM_DBOPEN: (nil)
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
@@ -276,6 +275,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling CALLER@test.ex
 t1 transport returned OK for CALLER@test.ex
 post-process CALLER@test.ex (0)
@@ -287,10 +287,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1236
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- CALLER@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  CALLER@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r3
 DSN: processing successful delivery address: CALLER@test.ex
@@ -309,6 +309,7 @@ search_tidyup called
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
 configuration file is TESTSUITE/test-config
@@ -382,23 +383,24 @@ unknown in local_parts? yes (end of list)
 calling r2 router
 r2 router called for unknown@test.ex
   domain = test.ex
-check dnssec require list
- test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.ex in dnssec_request_domains?
-  list element: *
-  test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of test.ex (MX) using fakens
-DNS lookup of test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for test.ex-MX-xxxx, ttl 3000
-test.ex (MX resp) DNSSEC
-DNS lookup of test.ex (A) using fakens
-DNS lookup of test.ex (A) gave NO_DATA
-returning DNS_NODATA
-faking res_search(A) response length as 65535
- writing neg-cache entry for test.ex-A-xxxx, ttl 3000
+main lookup for domain
+ check dnssec require list
+  test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.ex in dnssec_request_domains?
+   list element: *
+   test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of test.ex (MX) using fakens
+ DNS lookup of test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for test.ex-MX-xxxx, ttl 3000
+ test.ex (MX resp) DNSSEC
+ DNS lookup of test.ex (A) using fakens
+ DNS lookup of test.ex (A) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(A) response length as 65535
+  writing neg-cache entry for test.ex-A-xxxx, ttl 3000
 r2 router declined for unknown@test.ex
 --------> r3 router <--------
 local_part=unknown domain=test.ex