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 d424cc05370600a766434a2b9282aaf42a9f36df..339817ffda40d316361b67e02cdd5bb1e6298c32 100644 (file)
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -1,9 +1,7 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
-DSN: smart propagating DSN
-DSN: forward propagating DSN
-DSN: localuser propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing yes@myhost.test.ex
 --------> smart router <--------
@@ -20,8 +18,8 @@ file check: TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.yes
 stat() yielded 0
 calling forward router
-rda_interpret (file): TESTSUITE/aux-fixed/0084.$local_part
-expanded: TESTSUITE/aux-fixed/0084.yes
+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
 parse_forward_list: userx@test.ex
@@ -31,8 +29,8 @@ forward router generated userx@test.ex
   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 <--------
@@ -44,10 +42,10 @@ localuser router called for userx@test.ex
 queued for <unset> transport: local_part = userx
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=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 <--------
@@ -56,15 +54,15 @@ checking require_files
 file check: ! TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.no
 stat() yielded -1
-errno = 2
+errno = EEE
 calling smart router
 smart router called for no@myhost.test.ex
   domain = myhost.test.ex
 queued for <unset> transport: local_part = no
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by smart router
-  envelope to: no@myhost.test.ex
-  transport: <none>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  envelope to: no@myhost.test.ex
+  transport:   <none>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>