summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-15 16:53:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:24 -0500
commit275cf2b364983290288b2423365ae9c73fc53601 (patch)
tree0d38b9b17ffeef82d23a5ad531884e62aadc1375
parentab31a4421688142690a7903388abeb0786e7f4f9 (diff)
downloadsamba-275cf2b364983290288b2423365ae9c73fc53601.tar.gz
samba-275cf2b364983290288b2423365ae9c73fc53601.tar.bz2
samba-275cf2b364983290288b2423365ae9c73fc53601.zip
r12255: - we don't use SIGUSR1 anymore, so ignore it
- we don't handle SIGHUP just, so ignore it metze (This used to be commit 09a517bd974e47547d6c3f3ff932289c47845efe)
-rw-r--r--source4/smbd/server.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 41d6329b02..cff1bc7068 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -106,6 +106,9 @@ static void setup_signals(void)
BlockSignals(True,SIGFPE);
#endif
+ /* We are no longer interested in USR1 */
+ BlockSignals(True, SIGUSR1);
+
#if defined(SIGUSR2)
/* We are no longer interested in USR2 */
BlockSignals(True,SIGUSR2);
@@ -114,10 +117,12 @@ static void setup_signals(void)
/* POSIX demands that signals are inherited. If the invoking process has
* these signals masked, we will have problems, as we won't recieve them. */
BlockSignals(False, SIGHUP);
- BlockSignals(False, SIGUSR1);
BlockSignals(False, SIGTERM);
-}
+ /* as we don't handle on this signals yet, we need to ignore them,
+ * instead of terminating */
+ CatchSignal(SIGHUP, SIG_IGN);
+}
/*
handle io on stdin