From 02a5cdc06cd78e9798b71a5d9ebb6d8bcc43d127 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 22 Jun 2010 11:33:07 +0200 Subject: Resend SIGINT as SIGTERM in services Fixes: #462 --- src/monitor/monitor.c | 1 + src/util/server.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index bda45dc4..41eadf52 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -1779,6 +1779,7 @@ int monitor_process_init(struct mt_ctx *ctx, } /* Set up an event handler for a SIGINT */ + BlockSignals(false, SIGINT); tes = tevent_add_signal(ctx->ev, ctx, SIGINT, 0, monitor_quit, ctx); if (tes == NULL) { diff --git a/src/util/server.c b/src/util/server.c index 4b65da10..d55e971b 100644 --- a/src/util/server.c +++ b/src/util/server.c @@ -262,6 +262,9 @@ static void setup_signals(void) /* We are no longer interested in USR1 */ BlockSignals(true, SIGUSR1); + /* We are no longer interested in SIGINT except for monitor */ + BlockSignals(true, SIGINT); + #if defined(SIGUSR2) /* We are no longer interested in USR2 */ BlockSignals(true, SIGUSR2); -- cgit