diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-06-01 09:20:20 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-06-01 09:20:20 +0000 |
| commit | 25a679c92d35083d83fdaf2740b7bb20f781d3e5 (patch) | |
| tree | 46fdfa60f7e91b0e7ff4ce61f20a5c7ce41c9585 /usr.bin/tmux | |
| parent | d3f4a95ba783bd5caf3202960aea38ef6c92bcce (diff) | |
Clear signal handlers before event_reinit as apparently it can otherwise
cause libevent to go strange.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index 3d7cbde4cb7..53d65d55a91 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.124 2015/05/31 23:27:06 deraadt Exp $ */ +/* $OpenBSD: server.c,v 1.125 2015/06/01 09:20:19 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -129,9 +129,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()); |