Filters: fix "vacation" in Exim filter. Bug 2593

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

diff --git a/test/stderr/0374 b/test/stderr/0374
index cf1104120e84ecb3cdfff6e00108177b8e894ef7..cf5659d3fb93a7063467f5c8eebbb15c57efc32b 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -8,6 +8,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -58,7 +59,7 @@ set transport ut4
 queued for ut4 transport: local_part = d3
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d3@myhost.test.ex
   transport: ut4
@@ -86,7 +87,7 @@ ut4 router called for d2@myhost.test.ex
 queued for ut4 transport: local_part = d2
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d2@myhost.test.ex
   transport: ut4
@@ -114,7 +115,7 @@ ut4 router called for d1@myhost.test.ex
 queued for ut4 transport: local_part = d1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d1@myhost.test.ex
   transport: ut4
@@ -139,7 +140,7 @@ set transport ut3
 queued for ut3 transport: local_part = c1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^c\d
 routed by ut3 router (unseen)
   envelope to: c1@myhost.test.ex
   transport: ut3
@@ -160,7 +161,7 @@ set transport ut2
 queued for ut2 transport: local_part = b1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^b\d
 routed by ut2 router (unseen)
   envelope to: b1@myhost.test.ex
   transport: ut2
@@ -177,7 +178,7 @@ set transport ut1
 queued for ut1 transport: local_part = a1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^a\d
 routed by u1 router (unseen)
   envelope to: a1@myhost.test.ex
   transport: ut1
@@ -370,11 +371,11 @@ LOG: MAIN
   => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
-  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN
-  ** d3@myhost.test.ex R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -386,6 +387,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex
@@ -434,7 +436,7 @@ LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> R=real T=real
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>