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

[exim.git] / test / stderr / 0364

diff --git a/test/stderr/0364 b/test/stderr/0364
index a094006597d584652f3e5df1abf29acf6911caed..6f5f8eb30b19226e7863446d0d787166b6ecf01b 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -18,8 +19,8 @@ r1 router generated kilos@thishost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: kilos@thishost
-  transport: <none>
+  envelope to: kilos@thishost
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing kilos@thishost.test.ex
 --------> r2 router <--------
@@ -45,8 +46,8 @@ domain = thishost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r5 router
-  envelope to: kilos@thishost.test.ex
-  transport: t2
+  envelope to: kilos@thishost.test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing solik@otherhost
 --------> r1 router <--------
@@ -63,20 +64,23 @@ r1 router generated solik@otherhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: solik@otherhost
-  transport: <none>
+  envelope to: solik@otherhost
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing solik@otherhost.test.ex
 --------> r2 router <--------
 local_part=solik domain=otherhost.test.ex
 checking domains
+otherhost.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for solik@otherhost.test.ex
   domain = otherhost.test.ex
+main lookup for domain
 r2 router declined for solik@otherhost.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.test.ex
 checking domains
+otherhost.test.ex in domains? yes (end of list)
 checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
@@ -89,25 +93,29 @@ r3 router generated solik@otherhost.sub.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r3 router
-  envelope to: solik@otherhost.test.ex
-  transport: <none>
+  envelope to: solik@otherhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing solik@otherhost.sub.test.ex
 --------> r2 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains
+otherhost.sub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for solik@otherhost.sub.test.ex
   domain = otherhost.sub.test.ex
+main lookup for domain
 r2 router declined for solik@otherhost.sub.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains
+otherhost.sub.test.ex in domains? yes (end of list)
 checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 r3 router skipped: condition failure
 --------> r4 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains
+otherhost.sub.test.ex in domains? yes (end of list)
 calling r4 router
 rda_interpret (string): ':fail:Can't route to $domain'
 expanded: ':fail:Can't route to otherhost.sub.test.ex' (tainted)
@@ -131,24 +139,26 @@ r1 router generated xxx@ten-1.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: xxx@ten-1
-  transport: <none>
+  envelope to: xxx@ten-1
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@ten-1.test.ex
 --------> r2 router <--------
 local_part=xxx domain=ten-1.test.ex
 checking domains
+ten-1.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@ten-1.test.ex
   domain = ten-1.test.ex
+main lookup for domain
 set transport t1
 queued for t1 transport: local_part = xxx
 domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: xxx@ten-1.test.ex
-  transport: t1
+  envelope to: xxx@ten-1.test.ex
+  transport:   t1
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@testsub
@@ -166,20 +176,23 @@ r1 router generated xxx@testsub.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: xxx@testsub
-  transport: <none>
+  envelope to: xxx@testsub
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@testsub.test.ex
 --------> r2 router <--------
 local_part=xxx domain=testsub.test.ex
 checking domains
+testsub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@testsub.test.ex
   domain = testsub.test.ex
+main lookup for domain
 r2 router declined for xxx@testsub.test.ex
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex
 checking domains
+testsub.test.ex in domains? yes (end of list)
 checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
@@ -192,22 +205,24 @@ r3 router generated xxx@testsub.sub.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r3 router
-  envelope to: xxx@testsub.test.ex
-  transport: <none>
+  envelope to: xxx@testsub.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@testsub.sub.test.ex
 --------> r2 router <--------
 local_part=xxx domain=testsub.sub.test.ex
 checking domains
+testsub.sub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@testsub.sub.test.ex
   domain = testsub.sub.test.ex
+main lookup for domain
 queued for t1 transport: local_part = xxx
 domain = testsub.sub.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: xxx@testsub.sub.test.ex
-  transport: t1
+  envelope to: xxx@testsub.sub.test.ex
+  transport:   t1
   host testsub.sub.test.ex [V4NET.99.0.3]
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>