Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0297

diff --git a/test/stderr/0297 b/test/stderr/0297
index 42db67a73d94ec9ebac6e052e1b39974cd57bcc1..dc7e0c020d4e4bfd48953bb96fb9d7704221ff65 100644 (file)
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user


@@ -8,8 +9,8 @@ routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router

-rda_interpret (string): '${bless:$local_part}'
-expanded: '/a/b/c'
+rda_interpret (string): '$local_part'
+expanded: '/a/b/c' (tainted)

 file is not a filter file
 parse_forward_list: /a/b/c
 extract item: /a/b/c
 file is not a filter file
 parse_forward_list: /a/b/c
 extract item: /a/b/c


@@ -21,8 +22,9 @@ r1 router generated /a/b/c
 routed by r1 router
   envelope to: /a/b/c@myhost.test.ex
   transport: <none>
 routed by r1 router
   envelope to: /a/b/c@myhost.test.ex
   transport: <none>

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

 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user


@@ -32,8 +34,8 @@ routing /x/y/z@myhost.test.ex
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router

-rda_interpret (string): '${bless:$local_part}'
-expanded: '/x/y/z'
+rda_interpret (string): '$local_part'
+expanded: '/x/y/z' (tainted)

 file is not a filter file
 parse_forward_list: /x/y/z
 extract item: /x/y/z
 file is not a filter file
 parse_forward_list: /x/y/z
 extract item: /x/y/z


@@ -45,10 +47,10 @@ r1 router generated /x/y/z
 routed by r1 router
   envelope to: /x/y/z@myhost.test.ex
   transport: <none>
 routed by r1 router
   envelope to: /x/y/z@myhost.test.ex
   transport: <none>

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

 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss

-delivering 10HmaX-0005vi-00
+delivering 10HmaX-000000005vi-0000

 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN
 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN


@@ -57,7 +59,7 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
   Completed
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss

-delivering 10HmaY-0005vi-00
+delivering 10HmaY-000000005vi-0000

 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN
 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN


@@ -66,7 +68,7 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
   Completed
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss

-delivering 10HmaZ-0005vi-00
+delivering 10HmaZ-000000005vi-0000

 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN
 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN


@@ -75,7 +77,7 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
   Completed
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss

-delivering 10HmbA-0005vi-00
+delivering 10HmbA-000000005vi-0000

 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN
 LOG: MAIN
   original recipients ignored (system filter)
 LOG: MAIN