Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 0563

diff --git a/test/stderr/0563 b/test/stderr/0563
index 2354943f8685be2e9d5c53929619f8ef4c0c8ab2..30cd06ce666cdd8c60ed2725a7f58ca1d786817d 100644 (file)
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -1,10 +1,11 @@
 Exim version x.yz ....
+Hints DB:
 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_GECOS
 sender address = CALLER@testexim.test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
@@ -17,15 +18,29 @@ routing joe-real@testexim.test.ex
 --------> router1 router <--------
 local_part=joe-real domain=testexim.test.ex
 checking local_parts
-joe-real in "joe:sam:tom"? no (end of list)
-joe-real in "+aliases"? no (end of list)
+joe-real in local_parts?
+ list element: +aliases
+  start sublist aliases
+   joe-real in "joe:sam:tom"?
+   ╎list element: joe
+   ╎list element: sam
+   ╎list element: tom
+   joe-real in "joe:sam:tom"? no (end of list)
+  end sublist aliases
+joe-real in local_parts? no (end of list)
 router1 router skipped: local_parts mismatch
 --------> router2 router <--------
 local_part=joe-real domain=testexim.test.ex
 stripped suffix -real
 checking local_parts
-joe in "joe:sam:tom"? yes (matched "joe")
-joe in "+aliases"? yes (matched "+aliases")
+joe in local_parts?
+ list element: +aliases
+  start sublist aliases
+   joe in "joe:sam:tom"?
+   ╎list element: joe
+   ╎joe in "joe:sam:tom"? yes (matched "joe")
+  end sublist aliases
+ joe in local_parts? yes (matched "+aliases")
 calling router2 router
 router2 router called for joe-real@testexim.test.ex
   domain = testexim.test.ex
@@ -33,9 +48,9 @@ set transport local_delivery
 queued for local_delivery transport: local_part = joe
 domain = testexim.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=joe
 routed by router2 router
-  envelope to: joe-real@testexim.test.ex
-  transport: local_delivery
+  envelope to: joe-real@testexim.test.ex
+  transport:   local_delivery
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>