Merge branch 'obsd-master'

1 files changed, 11 insertions, 1 deletions

diff --git a/proc.c b/proc.c
index d3e7dec1..b10d4850 100644
--- a/proc.c
+++ b/proc.c
@@ -240,7 +240,7 @@ proc_set_signals(struct tmuxproc *tp, void (*signalcb)(int))
 }
 
 void
-proc_clear_signals(struct tmuxproc *tp)
+proc_clear_signals(struct tmuxproc *tp, int defaults)
 {
 	struct sigaction	sa;
 
@@ -260,6 +260,16 @@ proc_clear_signals(struct tmuxproc *tp)
 	signal_del(&tp->ev_sigusr1);
 	signal_del(&tp->ev_sigusr2);
 	signal_del(&tp->ev_sigwinch);
+
+	if (defaults) {
+		sigaction(SIGHUP, &sa, NULL);
+		sigaction(SIGCHLD, &sa, NULL);
+		sigaction(SIGCONT, &sa, NULL);
+		sigaction(SIGTERM, &sa, NULL);
+		sigaction(SIGUSR1, &sa, NULL);
+		sigaction(SIGUSR2, &sa, NULL);
+		sigaction(SIGWINCH, &sa, NULL);
+	}
 }
 
 struct tmuxpeer *