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 e20d7cc932190ed5161e640a2c5d4f1db99e2784..30cd06ce666cdd8c60ed2725a7f58ca1d786817d 100644 (file)
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config


@@ -17,7 +18,7 @@ routing joe-real@testexim.test.ex
 --------> router1 router <--------
 local_part=joe-real domain=testexim.test.ex
 checking local_parts
 --------> router1 router <--------
 local_part=joe-real domain=testexim.test.ex
 checking local_parts

-joe-real in "+aliases"?
+joe-real in local_parts?

  list element: +aliases
   start sublist aliases
    joe-real in "joe:sam:tom"?
  list element: +aliases
   start sublist aliases
    joe-real in "joe:sam:tom"?


@@ -26,20 +27,20 @@ joe-real in "+aliases"?
    ╎list element: tom
    joe-real in "joe:sam:tom"? no (end of list)
   end sublist aliases
    ╎list element: tom
    joe-real in "joe:sam:tom"? no (end of list)
   end sublist aliases

-joe-real in "+aliases"? no (end of list)
+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
 router1 router skipped: local_parts mismatch
 --------> router2 router <--------
 local_part=joe-real domain=testexim.test.ex
 stripped suffix -real
 checking local_parts

-joe in "+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
  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 "+aliases"? yes (matched "+aliases")
+ joe in local_parts? yes (matched "+aliases")

 calling router2 router
 router2 router called for joe-real@testexim.test.ex
   domain = testexim.test.ex
 calling router2 router
 router2 router called for joe-real@testexim.test.ex
   domain = testexim.test.ex


@@ -49,7 +50,7 @@ domain = testexim.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=joe
 routed by router2 router
   errors_to=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=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>