summaryrefslogtreecommitdiffstats
path: root/server.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-08-29 14:42:11 +0000
committerTiago Cunha <tcunha@gmx.com>2010-08-29 14:42:11 +0000
commit56040be3468e655256362c7d5b230b15236b9dd2 (patch)
treeac7667f2e41cc6d09c01dc58d084e715e3f3dd77 /server.c
parente6bb3d69422d948373b10074b043a8ef0189b1de (diff)
Sync OpenBSD patchset 751:
Do not call event_del() for signals after fork(), just use sigaction() directly instead - calling libevent functions after fork() w/o event_reinit() is a bad idea, even if in this case it was harmless.
Diffstat (limited to 'server.c')
-rw-r--r--server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server.c b/server.c
index 94bea25d..6d89fd01 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.242 2010-06-22 23:21:39 tcunha Exp $ */
+/* $Id: server.c,v 1.243 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -143,7 +143,7 @@ server_start(char *path)
/* event_init() was called in our parent, need to reinit. */
if (event_reinit(ev_base) != 0)
fatal("event_reinit failed");
- clear_signals();
+ clear_signals(0);
logfile("server");
log_debug("server started, pid %ld", (long) getpid());