smtp_accept_map_per_host: call search_tidyup in fail path. Bug 2597

[users/heiko/exim.git] / test / stderr / 0297

diff --git a/test/stderr/0297 b/test/stderr/0297
index f5db068eb9a4b97126a82c604cdc9f94a9db0c0b..42db67a73d94ec9ebac6e052e1b39974cd57bcc1 100644 (file)
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -2,14 +2,14 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): $local_part
-expanded: /a/b/c
+rda_interpret (string): '${bless:$local_part}'
+expanded: '/a/b/c'
 file is not a filter file
 parse_forward_list: /a/b/c
 extract item: /a/b/c
@@ -21,19 +21,19 @@ r1 router generated /a/b/c
 routed by r1 router
   envelope to: /a/b/c@myhost.test.ex
   transport: <none>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /x/y/z@myhost.test.ex
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): $local_part
-expanded: /x/y/z
+rda_interpret (string): '${bless:$local_part}'
+expanded: '/x/y/z'
 file is not a filter file
 parse_forward_list: /x/y/z
 extract item: /x/y/z
@@ -45,7 +45,7 @@ r1 router generated /x/y/z
 routed by r1 router
   envelope to: /x/y/z@myhost.test.ex
   transport: <none>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00