Tweak debug output

[exim.git] / test / stderr / 2200

diff --git a/test/stderr/2200 b/test/stderr/2200
index 48f66b12f47048c86b9d0f7e9ceb12b324228161..7f1722497a4c37cbc2a6ed54411d1af2c373630e 100644 (file)
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -2,52 +2,57 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-search_open: dnsdb "NULL"
-search_find: file="NULL"
-  key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=localhost.test.ex"
-database lookup required for a=localhost.test.ex
-dnsdb key: localhost.test.ex
-lookup yielded: 127.0.0.1
-search_open: dnsdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=localhost.test.ex"
-cached data used for lookup of a=localhost.test.ex
-lookup yielded: 127.0.0.1
+ search_open: dnsdb "NULL"
+ search_find: file="NULL"
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=dnsdb key="a=localhost.test.ex" opts=NULL
+ database lookup required for a=localhost.test.ex
+ dnsdb key: localhost.test.ex
+ creating new cache entry
+ lookup yielded: 127.0.0.1
+ search_open: dnsdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=dnsdb key="a=localhost.test.ex" opts=NULL
+ cached data used for lookup of a=localhost.test.ex
+ lookup yielded: 127.0.0.1
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 search_tidyup called
 search_tidyup called
-search_open: dnsdb "NULL"
-search_find: file="NULL"
-  key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=shorthost.test.ex"
-database lookup required for a=shorthost.test.ex
-dnsdb key: shorthost.test.ex
-lookup yielded: 127.0.0.1
-search_open: dnsdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=shorthost.test.ex"
-cached data found but past valid time; database lookup required for a=shorthost.test.ex
-dnsdb key: shorthost.test.ex
-lookup yielded: 127.0.0.1
+  search_open: dnsdb "NULL"
+  search_find: file="NULL"
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+  LRU list:
+  internal_search_find: file="NULL"
+    type=dnsdb key="a=shorthost.test.ex" opts=NULL
+  database lookup required for a=shorthost.test.ex
+                               (tainted)
+  dnsdb key: shorthost.test.ex
+  creating new cache entry
+  lookup yielded: 127.0.0.1
+  search_open: dnsdb "NULL"
+    cached open
+  search_find: file="NULL"
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+  LRU list:
+  internal_search_find: file="NULL"
+    type=dnsdb key="a=shorthost.test.ex" opts=NULL
+  cached data found but out-of-date;   database lookup required for a=shorthost.test.ex
+                               (tainted)
+  dnsdb key: shorthost.test.ex
+  replacing old cache entry
+  lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>