X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3b447cdfe3f9f53546d09d7e01d1e0ecf0d6696c..df12cced099ee64551adf71b5fa38695db62c3f9:/test/stderr/2201?ds=inline

diff --git a/test/stderr/2201 b/test/stderr/2201
index 26c59e86c..c1c39ef28 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -29,24 +29,26 @@ local_part=test.ex domain=test.ex
 checking domains
 search_open: dnsdb "NULL"
 search_find: file="NULL"
-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=dnsdb key="test.ex"
+  type=dnsdb key="test.ex" opts=NULL
 database lookup required for test.ex
+                             (tainted)
 dnsdb key: test.ex
 DNS lookup of test.ex (TXT) using fakens
 DNS lookup of test.ex (TXT) succeeded
+creating new cache entry
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 checking local_parts
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=dnsdb key="test.ex"
+  type=dnsdb key="test.ex" opts=NULL
 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
@@ -57,7 +59,7 @@ set transport local_delivery
 queued for local_delivery transport: local_part = test.ex
 domain = test.ex
   errors_to=NULL
-  domain_data=A TXT record for test.ex. localpart_data=A TXT record for test.ex.
+  domain_data=A TXT record for test.ex. local_part_data=A TXT record for test.ex.
 routed by r1 router
   envelope to: test.ex@test.ex
   transport: local_delivery
@@ -79,10 +81,10 @@ checking domains
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=dnsdb key="test.ex"
+  type=dnsdb key="test.ex" opts=NULL
 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
@@ -90,17 +92,19 @@ checking local_parts
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
-  key="unknown" partial=-1 affix=NULL starflags=0
+  key="unknown" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=dnsdb key="unknown"
+  type=dnsdb key="unknown" opts=NULL
 database lookup required for unknown
+                             (tainted)
 dnsdb key: unknown
 DNS lookup of unknown (TXT) using fakens
 DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 faking res_search(TXT) response length as 65535
  writing neg-cache entry for unknown-TXT-xxxx, ttl 3000
+creating new cache entry
 lookup failed
 unknown in "dnsdb;unknown"? no (end of list)
 r1 router skipped: local_parts mismatch
@@ -110,10 +114,10 @@ checking domains
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=dnsdb key="test.ex"
+  type=dnsdb key="test.ex" opts=NULL
 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
@@ -122,14 +126,15 @@ address match test: subject=CALLER@myhost.test.ex pattern=dnsdb;A=myhost.test.ex
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
-  key="A=myhost.test.ex" partial=-1 affix=NULL starflags=0
+  key="A=myhost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=dnsdb key="A=myhost.test.ex"
+  type=dnsdb key="A=myhost.test.ex" opts=NULL
 database lookup required for A=myhost.test.ex
 dnsdb key: myhost.test.ex
 DNS lookup of myhost.test.ex (A) using fakens
 DNS lookup of myhost.test.ex (A) succeeded
+creating new cache entry
 lookup yielded: V4NET.10.10.10
 CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
 calling r2 router
@@ -139,7 +144,7 @@ set transport local_delivery
 queued for local_delivery transport: local_part = unknown
 domain = test.ex
   errors_to=NULL
-  domain_data=A TXT record for test.ex. localpart_data=NULL
+  domain_data=A TXT record for test.ex. local_part_data=NULL
 routed by r2 router
   envelope to: unknown@test.ex
   transport: local_delivery
@@ -153,31 +158,35 @@ 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
+  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"
+  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
+  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"
+  type=dnsdb key="a=shorthost.test.ex" opts=NULL
 cached data used for lookup of a=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
+  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"
-cached data found but past valid time; database lookup required for a=shorthost.test.ex
+  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
   <= a@shorthost.test.ex U=CALLER P=local S=sss
@@ -230,4 +239,5 @@ ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
 ppppp Listening...
+ppppp SIGTERM/SIGINT seen
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>