X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4da19af657ed2687d20c1eb8cf85a66a70804e2d..67cc3ad2fe09fa6197c54a18fa9eb8f1375a87ec:/test/stderr/2201

diff --git a/test/stderr/2201 b/test/stderr/2201
index d5c42d456..61b8b2967 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -21,37 +21,43 @@ routing test.ex@test.ex
 --------> r0 router <--------
 local_part=test.ex domain=test.ex
 checking senders
-address match test: subject=CALLER@myhost.test.ex pattern=a@shorthost.test.ex
+CALLER@myhost.test.ex in "a@shorthost.test.ex"?
+ list element: a@shorthost.test.ex
+ address match test: subject=CALLER@myhost.test.ex pattern=a@shorthost.test.ex
 CALLER@myhost.test.ex in "a@shorthost.test.ex"? no (end of list)
 r0 router skipped: senders mismatch
 --------> r1 router <--------
 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 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="test.ex" opts=NULL
-database lookup required for test.ex
-                             (tainted)
-dnsdb key: test.ex
+test.ex in "dnsdb;test.ex"?
+ list element: dnsdb;test.ex
+ search_open: dnsdb "NULL"
+ search_find: file="NULL"
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   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")
+ 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 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  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")
+test.ex in "dnsdb;test.ex"?
+ list element: dnsdb;test.ex
+ search_open: dnsdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   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")
 calling r1 router
 r1 router called for test.ex@test.ex
   domain = test.ex
@@ -72,71 +78,81 @@ routing unknown@test.ex
 --------> r0 router <--------
 local_part=unknown domain=test.ex
 checking senders
-address match test: subject=CALLER@myhost.test.ex pattern=a@shorthost.test.ex
+CALLER@myhost.test.ex in "a@shorthost.test.ex"?
+ list element: a@shorthost.test.ex
+ address match test: subject=CALLER@myhost.test.ex pattern=a@shorthost.test.ex
 CALLER@myhost.test.ex in "a@shorthost.test.ex"? no (end of list)
 r0 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=unknown domain=test.ex
 checking domains
-search_open: dnsdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  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")
+test.ex in "dnsdb;test.ex"?
+ list element: dnsdb;test.ex
+ search_open: dnsdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   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")
 checking local_parts
-search_open: dnsdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="unknown" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="unknown" opts=NULL
-database lookup required for unknown
-                             (tainted)
-dnsdb key: unknown
+unknown in "dnsdb;unknown"?
+ list element: dnsdb;unknown
+ search_open: dnsdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="unknown" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   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
+ creating new cache entry
+ lookup failed
 unknown in "dnsdb;unknown"? no (end of list)
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=unknown domain=test.ex
 checking domains
-search_open: dnsdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  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")
+test.ex in "dnsdb;test.ex"?
+ list element: dnsdb;test.ex
+ search_open: dnsdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   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")
 checking senders
-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 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="A=myhost.test.ex" opts=NULL
-database lookup required for A=myhost.test.ex
-dnsdb key: myhost.test.ex
+CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"?
+ list element: dnsdb;A=myhost.test.ex
+ 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 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   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")
+ 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
 r2 router called for unknown@test.ex
   domain = test.ex
@@ -204,16 +220,16 @@ daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
  TESTSUITE/spool/exim_daemon_notify
-listening on all interfaces (IPv4) port 1225
+listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/exim-daemon.pid
 LOG: MAIN
-  exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port 1225
+  exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 Connection request from 127.0.0.1 port sssss
 p1238 Process p1238 is handling incoming connection from [127.0.0.1]
 p1238 Process p1238 is ready for new message
-p1240 SMTP accept process running
+1 SMTP accept process running
 Listening...
 p1238 dnslists check: rbl.test.ex/V4NET.11.12.14
 p1238 new DNS lookup for 14.12.11.V4NET.rbl.test.ex
@@ -230,10 +246,10 @@ p1238 dnslists: wrote cache entry, ttl=2
 p1238 DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 p1238 => that means V4NET.11.12.14 is listed at rbl.test.ex
 LOG: MAIN
-  <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+  <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-000000005vi-0000@myhost.test.ex
 Process p1238 is ready for new message
 LOG: smtp_connection MAIN
-  SMTP connection from localhost (myhost.test.ex) [127.0.0.1] closed by QUIT
+  SMTP connection from localhost (myhost.test.ex) [127.0.0.1] D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 p1235 child p1238 ended: status=0x0
 p1235   normal exit, 0