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

[exim.git] / test / stderr / 0149

diff --git a/test/stderr/0149 b/test/stderr/0149
index 50d3de6ce8b4b6f1bd97582d302203c694cbc8a1..954ec58cd45a8e47a8db112fe0279241f0f45ca6 100644 (file)
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 configuration file is TESTSUITE/test-config
 admin user
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -6,7 +7,7 @@ routing x@ten
 --------> domainlist1 router <--------
 local_part=x domain=ten
 checking domains
 --------> domainlist1 router <--------
 local_part=x domain=ten
 checking domains

-ten in "<- test1 - test2-test3--4"? no (end of list)
+ten in " test1 - test2-test3--4"? no (end of list)

 ten in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@ten
 ten in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@ten


@@ -23,8 +24,8 @@ domain = ten
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist1 router

-  envelope to: x@ten
-  transport: <none>
+  envelope to: x@ten
+  transport:   <none>

   host V4NET.0.0.0 [V4NET.0.0.0]
   host V4NET.0.0.1 [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   host V4NET.0.0.0 [V4NET.0.0.0]
   host V4NET.0.0.1 [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -32,7 +33,7 @@ routing y@two
 --------> domainlist1 router <--------
 local_part=y domain=two
 checking domains
 --------> domainlist1 router <--------
 local_part=y domain=two
 checking domains

-two in "<- test1 - test2-test3--4"? no (end of list)
+two in " test1 - test2-test3--4"? no (end of list)

 two in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for y@two
 two in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for y@two


@@ -51,8 +52,8 @@ domain = two
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist1 router

-  envelope to: y@two
-  transport: <none>
+  envelope to: y@two
+  transport:   <none>

   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -76,8 +77,8 @@ domain = test1
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router

-  envelope to: x@test1
-  transport: local_delivery
+  envelope to: x@test1
+  transport:   local_delivery

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test2
 --------> domainlist1 router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test2
 --------> domainlist1 router <--------


@@ -98,8 +99,8 @@ domain = test2
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router

-  envelope to: x@test2
-  transport: local_delivery
+  envelope to: x@test2
+  transport:   local_delivery

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test3-4
 --------> domainlist1 router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test3-4
 --------> domainlist1 router <--------


@@ -120,14 +121,14 @@ domain = test3-4
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router

-  envelope to: x@test3-4
-  transport: local_delivery
+  envelope to: x@test3-4
+  transport:   local_delivery

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@one
 --------> domainlist1 router <--------
 local_part=x domain=one
 checking domains
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@one
 --------> domainlist1 router <--------
 local_part=x domain=one
 checking domains

-one in "<- test1 - test2-test3--4"? no (end of list)
+one in " test1 - test2-test3--4"? no (end of list)

 one in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@one
 one in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@one


@@ -158,8 +159,8 @@ domain = one
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist2 router

-  envelope to: x@one
-  transport: <none>
+  envelope to: x@one
+  transport:   <none>

   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -167,7 +168,7 @@ routing x@six
 --------> domainlist1 router <--------
 local_part=x domain=six
 checking domains
 --------> domainlist1 router <--------
 local_part=x domain=six
 checking domains

-six in "<- test1 - test2-test3--4"? no (end of list)
+six in " test1 - test2-test3--4"? no (end of list)

 six in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@six
 six in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@six


@@ -196,8 +197,8 @@ domain = six
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist2 router

-  envelope to: x@six
-  transport: <none>
+  envelope to: x@six
+  transport:   <none>

   host V4NET.0.0.6 [V4NET.0.0.6]
   host V4NET.0.0.7 [V4NET.0.0.7]
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
   host V4NET.0.0.6 [V4NET.0.0.6]
   host V4NET.0.0.7 [V4NET.0.0.7]
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>