From b87de399f2037be2a689f8df8e97f20f32fdce46 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 17 Apr 2007 15:33:20 +1000 Subject: [PATCH] block SIGPIPE in the daemon to prevent a SIGPIPE on write to a dead socket (This used to be ctdb commit 02c09dc07c9bed57ca3692b14e41ac8cca0a29f4) --- ctdb/common/ctdb_daemon.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c index 5a90003bc0d..67653202af2 100644 --- a/ctdb/common/ctdb_daemon.c +++ b/ctdb/common/ctdb_daemon.c @@ -25,6 +25,7 @@ #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" +#include "system/wait.h" #include "../include/ctdb.h" #include "../include/ctdb_private.h" @@ -47,6 +48,18 @@ static void set_non_blocking(int fd) fcntl(fd, F_SETFL, v | O_NONBLOCK); } +static void block_signal(int signum) +{ + struct sigaction act; + + memset(&act, 0, sizeof(act)); + + act.sa_handler = SIG_IGN; + sigemptyset(&act.sa_mask); + sigaddset(&act.sa_mask, signum); + sigaction(signum, &act, NULL); +} + /* structure describing a connected client in the daemon @@ -558,6 +571,8 @@ int ctdb_start(struct ctdb_context *ctdb) return 0; } + block_signal(SIGPIPE); + /* ensure the socket is deleted on exit of the daemon */ domain_socket_name = talloc_strdup(talloc_autofree_context(), ctdb->daemon.name); talloc_set_destructor(domain_socket_name, unlink_destructor); -- 2.47.3