Tweak debug output

[exim.git] / test / stderr / 0499

diff --git a/test/stderr/0499 b/test/stderr/0499
index 4592f64698a48307ee7b2f772db549728c28f3f7..bb12c160b2d26f2dda78a85807dd5b4f7c4c6778 100644 (file)
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -1,9 +1,9 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 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
 configuration file is TESTSUITE/test-config
 admin user

-DSN: r1 propagating DSN
+dropping to exim gid; retaining priv uid

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID


@@ -21,20 +21,21 @@ DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX
 DNS lookup of eximtesthost.test.ex (A) using fakens
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX

-host_find_bydns yield = HOST_FOUND_LOCAL (3); returned hosts:
+host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:

   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
 mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
 mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")

+data from lookup saved for cache for +anymx: key 'mxt1.test.ex' value '@mx_any'

 mxt1.test.ex in "+anymx"? yes (matched "+anymx")
 mxt1.test.ex in "+anymx"? yes (matched "+anymx")

-checking "condition"
+checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...

 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX
 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX

-host_find_bydns yield = HOST_FOUND_LOCAL (3); returned hosts:
+host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:

   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 

-mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
-mxt1.test.ex in "+anymx"? yes (matched "+anymx")
+ mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+ mxt1.test.ex in "+anymx"? yes (matched "+anymx")

 calling r1 router
 r1 router called for ph@mxt1.test.ex
   domain = mxt1.test.ex
 calling r1 router
 r1 router called for ph@mxt1.test.ex
   domain = mxt1.test.ex


@@ -42,9 +43,9 @@ set transport t1
 queued for t1 transport: local_part = ph
 domain = mxt1.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = ph
 domain = mxt1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=@mx_any local_part_data=NULL

 routed by r1 router
   envelope to: ph@mxt1.test.ex
   transport: t1
 search_tidyup called
 routed by r1 router
   envelope to: ph@mxt1.test.ex
   transport: t1
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>