Merge branch 'router_dynamic_modules'

[exim.git] / test / stderr / 0084

diff --git a/test/stderr/0084 b/test/stderr/0084
index 2b2f39621b2005e7238bc94e63ba544b88a370a9..c1db2a3e69ebf012ea0a0478cc91fc756fe28abc 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.$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


@@ -41,7 +42,7 @@ localuser router called for userx@test.ex
 queued for <unset> transport: local_part = userx
 domain = test.ex
   errors_to=NULL
 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>
 routed by localuser router
   envelope to: userx@test.ex
   transport: <none>


@@ -60,8 +61,8 @@ smart router called for no@myhost.test.ex
 queued for <unset> transport: local_part = no
 domain = myhost.test.ex
   errors_to=NULL
 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>
 routed by smart router
   envelope to: no@myhost.test.ex
   transport: <none>

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>