X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/836c3e4102dae52604590a6674bec10087dbf17e..4aaeaddeaa130a227a694d32b7214689e982a39e:/test/stderr/2201

diff --git a/test/stderr/2201 b/test/stderr/2201
index fd1452a89..fb618fc64 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -29,10 +29,10 @@ 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
 dnsdb key: test.ex
 DNS lookup of test.ex (TXT) using fakens
@@ -43,10 +43,10 @@ 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")
@@ -79,10 +79,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,10 +90,10 @@ 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
 dnsdb key: unknown
 DNS lookup of unknown (TXT) using fakens
@@ -110,10 +110,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,10 +122,10 @@ 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
@@ -153,30 +153,30 @@ 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
 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
+  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 either wrong opts or dated; database lookup required for a=shorthost.test.ex
 dnsdb key: shorthost.test.ex
 lookup yielded: 127.0.0.1
 LOG: MAIN
@@ -202,10 +202,8 @@ ppppp   exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on
 ppppp daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
-ppppp daemon forking for daemon-accept
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
-ppppp daemon forked for daemon-accept: npppp
 ppppp 1 SMTP accept process running
 ppppp Listening...
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
@@ -232,6 +230,4 @@ ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
 ppppp Listening...
-ppppp daemon forking for daemon-del-pidfile
-ppppp daemon forked for daemon-del-pidfile: npppp
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>