tidying

[exim.git] / test / stderr / 0438

diff --git a/test/stderr/0438 b/test/stderr/0438
index f44d7bb763ebca96c36b3f7cadb90b85b290ec65..b63c3c556844aa91ff9360448372e7202bec2e2e 100644 (file)
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -1,38 +1,77 @@
 
 ******** SERVER ********
 Exim version x.yz ....
 
 ******** SERVER ********
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1225
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1225

-listening on all interfaces (IPv4) port 1225
+creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
+listening on all interfaces (IPv4) port PORT_D

 pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
 pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234

 LOG: MAIN
 LOG: MAIN

-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
+  exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D

 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...

+SIGTERM/SIGINT seen
+p1237 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

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

+Hints DB:

 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1235

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1225
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1225

-listening on all interfaces (IPv4) port 1225
+creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
+listening on all interfaces (IPv4) port PORT_D

 pid written to TESTSUITE/spool/exim-daemon.anotherpid
 changed uid/gid: running as a daemon
 pid written to TESTSUITE/spool/exim-daemon.anotherpid
 changed uid/gid: running as a daemon

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1235

 LOG: MAIN
 LOG: MAIN

-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
+  exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D
+set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D

 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...

+SIGTERM/SIGINT seen
+p1238 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
+Exim version x.yz ....
+Hints DB:
+changed uid/gid: forcing real = effective
+  uid=uuuu gid=CALLER_GID pid=p1236
+configuration file is TESTSUITE/test-config
+admin user
+dropping to exim gid; retaining priv uid
+originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
+daemon_smtp_port overridden by -oX:
+  <: 1225
+creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
+listening on all interfaces (IPv4) port PORT_D
+pid written to TESTSUITE/spool/mypidfile
+changed uid/gid: running as a daemon
+  uid=EXIM_UID gid=EXIM_GID pid=p1236
+LOG: MAIN
+  exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D
+set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D
+daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
+Listening...
+SIGTERM/SIGINT seen
+p1239 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>