X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/46d2a5e6f6e7709d172903b13945d23fc0a2c888..82ab9af25b43cb3b56a95383eba52a866400911a:/test/stderr/0419?ds=sidebyside

diff --git a/test/stderr/0419 b/test/stderr/0419
index 0af69e98d..6ea0d7822 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -1,10 +1,10 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
@@ -17,37 +17,46 @@ routing k@mxt13.test.ex
 --------> dnslookup router <--------
 local_part=k domain=mxt13.test.ex
 checking domains
-mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
+mxt13.test.ex in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎list element: !mxt13.test.ex
+   ╎mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'mxt13.test.ex' value 'mxt13.test.ex'
 mxt13.test.ex in "! +local_domains"? yes (end of list)
 calling dnslookup router
 dnslookup router called for k@mxt13.test.ex
   domain = mxt13.test.ex
-mxt13.test.ex in "*"? yes (matched "*")
+mxt13.test.ex in "*"?
+ list element: *
+ mxt13.test.ex in "*"? yes (matched "*")
 DNS lookup of mxt13.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of mxt13.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of other1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of other1.test.ex (A) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of other2.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of other2.test.ex (A) succeeded
-other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
+other1.test.ex in hosts_treat_as_local?
+ list element: +local_domains
+  start sublist local_domains
+   other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎list element: !mxt13.test.ex
+   ╎list element: !other1.test.ex
+   ╎other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
+  end sublist local_domains
 other1.test.ex in hosts_treat_as_local? no (end of list)
-other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
-other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
+other2.test.ex in hosts_treat_as_local?
+ list element: +local_domains
+  start sublist local_domains
+   other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎list element: !mxt13.test.ex
+   ╎list element: !other1.test.ex
+   ╎list element: *.test.ex
+   ╎other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
+  end sublist local_domains
+ other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
 local host in host list - removed hosts:
   other2.test.ex V4NET.12.3.2 5
   other2.test.ex V4NET.12.3.1 5
@@ -58,10 +67,10 @@ set transport smtp
 queued for smtp transport: local_part = k
 domain = mxt13.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=mxt13.test.ex local_part_data=NULL
 routed by dnslookup router
   envelope to: k@mxt13.test.ex
   transport: smtp
   host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>