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

[exim.git] / test / stderr / 0084

diff --git a/test/stderr/0084 b/test/stderr/0084
index 3f15cbc8f087f5084b401d59069826877322c606..339817ffda40d316361b67e02cdd5bb1e6298c32 100644 (file)
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -17,7 +18,7 @@ file check: TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.yes
 stat() yielded 0
 calling forward router
 expanded file: TESTSUITE/aux-fixed/0084.yes
 stat() yielded 0
 calling forward router

-rda_interpret (file): 'TESTSUITE/aux-fixed/0084.${bless:$local_part}'
+rda_interpret (file): '${lookup {0084.$local_part} dsearch,ret=full {TESTSUITE/aux-fixed}}'

 expanded: 'TESTSUITE/aux-fixed/0084.yes'
 ssss bytes read from TESTSUITE/aux-fixed/0084.yes
 file is not a filter file
 expanded: 'TESTSUITE/aux-fixed/0084.yes'
 ssss bytes read from TESTSUITE/aux-fixed/0084.yes
 file is not a filter file


@@ -28,8 +29,8 @@ forward router generated userx@test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by forward router
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by forward router

-  envelope to: yes@myhost.test.ex
-  transport: <none>
+  envelope to: yes@myhost.test.ex
+  transport:   <none>

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> localuser router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> localuser router <--------


@@ -43,8 +44,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=userx
 routed by localuser router
   errors_to=NULL
   domain_data=NULL local_part_data=userx
 routed by localuser router

-  envelope to: userx@test.ex
-  transport: <none>
+  envelope to: userx@test.ex
+  transport:   <none>

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing no@myhost.test.ex
 --------> smart router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing no@myhost.test.ex
 --------> smart router <--------


@@ -62,6 +63,6 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by smart router
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by smart router

-  envelope to: no@myhost.test.ex
-  transport: <none>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  envelope to: no@myhost.test.ex
+  transport:   <none>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>