Close notifier socket before re-exec of daemon. Bug 2539

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

diff --git a/test/stderr/0375 b/test/stderr/0375
index 8b59febdc07682b9b9346bb9f9d53ced31b60953..cc30e566832da80541746e79dc11b9379786555e 100644 (file)
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -1,15 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN

 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log


@@ -17,15 +8,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
+dropping to exim gid; retaining priv uid

 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -858,30 +841,13 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN

 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
+dropping to exim gid; retaining priv uid

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex


@@ -944,46 +910,28 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> P=<> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> P=<> R=real T=real

-locking TESTSUITE/spool/db/retry.lockfile

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed

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

 LOG: MAIN
   d3@myhost.test.ex <d3@myhost.test.ex>: error ignored
 log writing disabled
 LOG: MAIN
   b1@myhost.test.ex <b1@myhost.test.ex>: error ignored
 log writing disabled
 LOG: MAIN
   d3@myhost.test.ex <d3@myhost.test.ex>: error ignored
 log writing disabled
 LOG: MAIN
   b1@myhost.test.ex <b1@myhost.test.ex>: error ignored
 log writing disabled

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

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN

 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
+dropping to exim gid; retaining priv uid

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: h1@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: h1@myhost.test.ex


@@ -1070,8 +1018,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => h1 <h1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=ut8 T=ut1
 log writing disabled
 LOG: MAIN
   => h1 <h1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=ut8 T=ut1
 log writing disabled

-locking TESTSUITE/spool/db/retry.lockfile

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed

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