aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-06-01 12:01:17 +0100
committerThomas Adam <thomas@xteddy.org>2015-06-01 12:01:17 +0100
commitb675e6b2d552472288c2f0cc606cc141c650bcee (patch)
treeb491ab228458808dae35ab29f10a485960ee848c
parent7712e6f82b7068fb03d86cfc353290a1aae95d30 (diff)
parent58b50fb543168128f1eef30ad9908cf27ee91f41 (diff)
downloadrtmux-b675e6b2d552472288c2f0cc606cc141c650bcee.tar.gz
rtmux-b675e6b2d552472288c2f0cc606cc141c650bcee.tar.bz2
rtmux-b675e6b2d552472288c2f0cc606cc141c650bcee.zip
Merge branch 'obsd-master'
-rw-r--r--server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/server.c b/server.c
index a74aaa3e..4149aa14 100644
--- a/server.c
+++ b/server.c
@@ -128,9 +128,9 @@ server_start(int lockfd, char *lockfile)
fatal("daemon failed");
/* event_init() was called in our parent, need to reinit. */
+ clear_signals(0);
if (event_reinit(ev_base) != 0)
fatal("event_reinit failed");
- clear_signals(0);
logfile("server");
log_debug("server started, pid %ld", (long) getpid());