tags 536060 patch pending upstream
thanks
[2010-06-12 09:53:31] markus schnalke <[email protected]>
>
> Currently I can't tell why the daemon does not restart logging. (On
> SIGHUP it closes all open fds and exec()s itself again.) I'll dig
> deeper in this.
I found the bug now and it is fixed in the upstream source code repo.
The situation was such:
When running in daemon mode, first the log files are opened. They get
assigned to the file descriptors 3 and 4 usually. Then std{in,out,err}
are closed. When SIGHUP comes in, all open files are closes and
masqmail reexecutes itself. The new masqmail instance opens the log
files at fd 0 and 1 now, but std{in,out,err} are closed afterwards,
thus the log files are closed.
The fix is to close the log files before std{in,out,err} are closed,
in case the log files have higher fds. After std{in,out,err} were
closed, the log files get opened again, now.
A new upstream release will probably appear soon. I'll create a new
package then.
meillo
diff -r 98cda87105a7 src/masqmail.c
--- a/src/masqmail.c Wed Jun 16 10:14:50 2010 +0200
+++ b/src/masqmail.c Wed Jun 16 10:17:17 2010 +0200
@@ -161,9 +161,15 @@
conf.do_verbose = FALSE;
+ /* closing and reopening the log ensures that it is open afterwards
+ because it is possible that the log is assigned to fd 1 and gets
+ thus closes by fclose(stdout). Similar for the debugfile.
+ */
+ logclose();
fclose(stdin);
fclose(stdout);
fclose(stderr);
+ logopen();
listen_port(do_listen ? conf.listen_addresses : NULL, queue_interval, argv);
}
@@ -194,9 +200,15 @@
conf.do_verbose = FALSE;
+ /* closing and reopening the log ensures that it is open afterwards
+ because it is possible that the log is assigned to fd 1 and gets
+ thus closes by fclose(stdout). Similar for the debugfile.
+ */
+ logclose();
fclose(stdin);
fclose(stdout);
fclose(stderr);
+ logopen();
get_daemon(get_interval, argv);
}
