git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Set mainlog_name and rejectlog_name unconditionally.
[exim.git] / test / stderr / 2201
diff --git a/test/stderr/2201 b/test/stderr/2201
index 405818c0792126a18ce6bc3b02d8cf41066e269b..feee638b335b1164219d29ab51a47c6ab64369b4 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -29,16 +29,13 @@ local_part=test.ex domain=test.ex
 checking domains
 search_open: dnsdb "NULL"
 search_find: file="NULL"
 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"
 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
 database lookup required for test.ex
 dnsdb key: test.ex
 DNS lookup of test.ex (TXT) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of test.ex (TXT) succeeded
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 DNS lookup of test.ex (TXT) succeeded
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
@@ -46,10 +43,10 @@ checking local_parts
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 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"
 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")
 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")
@@ -60,7 +57,7 @@ set transport local_delivery
 queued for local_delivery transport: local_part = test.ex
 domain = test.ex
   errors_to=NULL
 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
 routed by r1 router
   envelope to: test.ex@test.ex
   transport: local_delivery
@@ -82,10 +79,10 @@ checking domains
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 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"
 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")
 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")
@@ -93,16 +90,13 @@ checking local_parts
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 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"
 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
 database lookup required for unknown
 dnsdb key: unknown
 DNS lookup of unknown (TXT) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 faking res_search(TXT) response length as 65535
 DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 faking res_search(TXT) response length as 65535
@@ -116,10 +110,10 @@ checking domains
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 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"
 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")
 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")
@@ -128,16 +122,13 @@ address match test: subject=CALLER@myhost.test.ex pattern=dnsdb;A=myhost.test.ex
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 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"
 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
 database lookup required for A=myhost.test.ex
 dnsdb key: myhost.test.ex
 DNS lookup of myhost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of myhost.test.ex (A) succeeded
 lookup yielded: V4NET.10.10.10
 CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
 DNS lookup of myhost.test.ex (A) succeeded
 lookup yielded: V4NET.10.10.10
 CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
@@ -148,7 +139,7 @@ set transport local_delivery
 queued for local_delivery transport: local_part = unknown
 domain = test.ex
   errors_to=NULL
 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
 routed by r2 router
   envelope to: unknown@test.ex
   transport: local_delivery
@@ -162,37 +153,31 @@ search_tidyup called
 search_tidyup called
 search_open: dnsdb "NULL"
 search_find: file="NULL"
 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"
 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
 database lookup required for a=shorthost.test.ex
 dnsdb key: shorthost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 lookup yielded: 127.0.0.1
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 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"
 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"
 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"
 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
 dnsdb key: shorthost.test.ex
 dnsdb key: shorthost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 lookup yielded: 127.0.0.1
 LOG: MAIN
   <= a@shorthost.test.ex U=CALLER P=local S=sss
 lookup yielded: 127.0.0.1
 LOG: MAIN
   <= a@shorthost.test.ex U=CALLER P=local S=sss
@@ -217,29 +202,14 @@ 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 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 postfork: daemon-accept
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon forked for daemon-accept: npppp
 ppppp 1 SMTP accept process running
 ppppp Listening...
 ppppp 1 SMTP accept process running
 ppppp Listening...
-ppppp daemon-accept forked for fakens-search: npppp
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp new DNS lookup for 14.12.11.V4NET.rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp dnslists: using result of previous lookup
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp dnslists: using result of previous lookup
@@ -247,14 +217,8 @@ ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp LOG: MAIN
 ppppp   <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp LOG: MAIN
 ppppp   <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
@@ -266,7 +230,4 @@ ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
 ppppp Listening...
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
 ppppp Listening...
-ppppp daemon forking for daemon-del-pidfile
-ppppp postfork: daemon-del-pidfile
-ppppp daemon forked for daemon-del-pidfile: npppp
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository