tidying

[exim.git] / test / stderr / 0378

diff --git a/test/stderr/0378 b/test/stderr/0378
index bb7b4a40aae0d59328e4375e806ce014cb308501..b3ab37ec9e9d72a3237407db3c8e713c1ec0600c 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -1,22 +1,16 @@
 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

-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN

 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 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

-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
-locking TESTSUITE/spool/db/retry.lockfile
+dropping to exim gid; retaining priv uid

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex


@@ -27,35 +21,34 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts

+aaaa in local_parts? no (end of list)

 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts

-checking "condition"
+checking "condition" "${if first_delivery{no}{yes}}"...

 aaaa_2nd_time router skipped: condition failure
 --------> aaaa router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling aaaa router
 aaaa_2nd_time router skipped: condition failure
 --------> aaaa router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling aaaa router

-rda_interpret (string): # Exim filter
-deliver defer_aaaa@$domain
-save TESTSUITE/test-mail/file
-pipe "/bin/sh -c exit"
-mail subject autoreply
-text "This is an autoreply"
-expanded: # Exim filter
+rda_interpret (string): '# Exim filter\ndeliver defer_aaaa@$domain\nsave TESTSUITE/test-mail/file\npipe "/bin/sh -c exit"\nmail subject autoreply\ntext "This is an autoreply"'
+expanded: '# Exim filter

 deliver defer_aaaa@myhost.test.ex
 save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
 deliver defer_aaaa@myhost.test.ex
 save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply

-text "This is an autoreply"
+text "This is an autoreply"' (tainted)

 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing

+>>>>>>>>>>>>>>>> Exim pid=p1237 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex


@@ -78,7 +71,6 @@ aaaa router generated defer_aaaa@myhost.test.ex
 routed by aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: <none>
 routed by aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: <none>

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex


@@ -101,13 +93,15 @@ routing defer_aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking local_parts
 calling defer router
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking local_parts
 calling defer router

-rda_interpret (string): :defer: forced defer
-expanded: :defer: forced defer
+rda_interpret (string): ':defer: forced defer'
+expanded: ':defer: forced defer'

 file is not a filter file
 parse_forward_list: :defer: forced defer
 extract item: :defer: forced defer
 file is not a filter file
 parse_forward_list: :defer: forced defer
 extract item: :defer: forced defer


@@ -125,25 +119,18 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
   Failed addresses:
   Deferred addresses:
     defer_aaaa@myhost.test.ex

-locking TESTSUITE/spool/db/retry.lockfile

 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

-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN

 LOG: MAIN
 LOG: MAIN

-  <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
+  <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss

 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

-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
-locking TESTSUITE/spool/db/retry.lockfile
+dropping to exim gid; retaining priv uid

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex


@@ -155,8 +142,8 @@ routing CALLER@myhost.test.ex
 local_part=CALLER domain=myhost.test.ex
 checking senders
 calling bounce router
 local_part=CALLER domain=myhost.test.ex
 checking senders
 calling bounce router

-rda_interpret (string): :blackhole:
-expanded: :blackhole:
+rda_interpret (string): ':blackhole:'
+expanded: ':blackhole:'

 file is not a filter file
 parse_forward_list: :blackhole:
 extract item: :blackhole:
 file is not a filter file
 parse_forward_list: :blackhole:
 extract item: :blackhole:


@@ -171,30 +158,27 @@ After routing:
   Deferred addresses:
 LOG: MAIN
   Completed
   Deferred addresses:
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3

-locking TESTSUITE/spool/db/retry.lockfile

 transport error EPIPE ignored
 transport error EPIPE ignored

+>>>>>>>>>>>>>>>> Exim pid=p1241 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => |/bin/sh -c exit <aaaa@myhost.test.ex> R=aaaa T=t2
 LOG: MAIN
   => |/bin/sh -c exit <aaaa@myhost.test.ex> R=aaaa T=t2

-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1242 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1

-locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 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

-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
+dropping to exim gid; retaining priv uid

 LOG: queue_run MAIN
 LOG: queue_run MAIN

-  Start queue run: pid=pppp -qf
-locking TESTSUITE/spool/db/retry.lockfile
+  Start queue run: pid=p1234 -qf

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 unique = aaaa@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 unique = aaaa@myhost.test.ex


@@ -204,18 +188,21 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts

+aaaa in local_parts? no (end of list)

 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts

-checking "condition"
+checking "condition" "${if first_delivery{no}{yes}}"...

 calling aaaa_2nd_time router
 calling aaaa_2nd_time router

-rda_interpret (string): aaaa@$domain
-expanded: aaaa@myhost.test.ex
+rda_interpret (string): 'aaaa@$domain'
+expanded: 'aaaa@myhost.test.ex' (tainted)

 file is not a filter file
 parse_forward_list: aaaa@myhost.test.ex
 extract item: aaaa@myhost.test.ex
 file is not a filter file
 parse_forward_list: aaaa@myhost.test.ex
 extract item: aaaa@myhost.test.ex


@@ -225,7 +212,6 @@ aaaa_2nd_time router generated aaaa@myhost.test.ex
 routed by aaaa_2nd_time router
   envelope to: aaaa@myhost.test.ex
   transport: <none>
 routed by aaaa_2nd_time router
   envelope to: aaaa@myhost.test.ex
   transport: <none>

-locking TESTSUITE/spool/db/retry.lockfile

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 unique = \0\aaaa@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 unique = \0\aaaa@myhost.test.ex


@@ -235,10 +221,13 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts

+aaaa in local_parts? no (end of list)

 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 aaaa_2nd_time router skipped: previously routed aaaa@myhost.test.ex
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 aaaa_2nd_time router skipped: previously routed aaaa@myhost.test.ex


@@ -246,21 +235,17 @@ aaaa_2nd_time router skipped: previously routed aaaa@myhost.test.ex
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling aaaa router
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling aaaa router

-rda_interpret (string): # Exim filter
-deliver defer_aaaa@$domain
-save TESTSUITE/test-mail/file
-pipe "/bin/sh -c exit"
-mail subject autoreply
-text "This is an autoreply"
-expanded: # Exim filter
+rda_interpret (string): '# Exim filter\ndeliver defer_aaaa@$domain\nsave TESTSUITE/test-mail/file\npipe "/bin/sh -c exit"\nmail subject autoreply\ntext "This is an autoreply"'
+expanded: '# Exim filter

 deliver defer_aaaa@myhost.test.ex
 save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
 deliver defer_aaaa@myhost.test.ex
 save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply

-text "This is an autoreply"
+text "This is an autoreply"' (tainted)

 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing

+>>>>>>>>>>>>>>>> Exim pid=p1243 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex


@@ -283,7 +268,6 @@ aaaa router generated defer_aaaa@myhost.test.ex
 routed by aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: <none>
 routed by aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: <none>

-locking TESTSUITE/spool/db/retry.lockfile

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex
 unique = defer_aaaa@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex
 unique = defer_aaaa@myhost.test.ex


@@ -305,13 +289,15 @@ routing defer_aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking local_parts
 calling defer router
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking local_parts
 calling defer router

-rda_interpret (string): :defer: forced defer
-expanded: :defer: forced defer
+rda_interpret (string): ':defer: forced defer'
+expanded: ':defer: forced defer'

 file is not a filter file
 parse_forward_list: :defer: forced defer
 extract item: :defer: forced defer
 file is not a filter file
 parse_forward_list: :defer: forced defer
 extract item: :defer: forced defer


@@ -326,7 +312,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
   Failed addresses:
   Deferred addresses:
     defer_aaaa@myhost.test.ex

-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
 LOG: queue_run MAIN

-  End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234 -qf
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>