===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/client.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -c -r1.122 -r1.123
*** src/usr.bin/tmux/client.c	2017/07/12 09:24:17	1.122
--- src/usr.bin/tmux/client.c	2017/07/14 18:49:07	1.123
***************
*** 1,4 ****
! /* $OpenBSD: client.c,v 1.122 2017/07/12 09:24:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: client.c,v 1.123 2017/07/14 18:49:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 365,371 ****
  	if (client_exittype == MSG_EXEC) {
  		if (client_flags & CLIENT_CONTROLCONTROL)
  			tcsetattr(STDOUT_FILENO, TCSAFLUSH, &saved_tio);
- 		proc_clear_signals(client_proc);
  		client_exec(client_execshell, client_execcmd);
  	}
  
--- 365,370 ----
***************
*** 481,486 ****
--- 480,487 ----
  		xasprintf(&argv0, "%s", name);
  	setenv("SHELL", shell, 1);
  
+ 	proc_clear_signals(client_proc, 1);
+ 
  	setblocking(STDIN_FILENO, 1);
  	setblocking(STDOUT_FILENO, 1);
  	setblocking(STDERR_FILENO, 1);
***************
*** 628,634 ****
  		if (datalen == 0 || data[datalen - 1] != '\0')
  			fatalx("bad MSG_SHELL string");
  
- 		proc_clear_signals(client_proc);
  		client_exec(data, shell_command);
  		/* NOTREACHED */
  	case MSG_DETACH:
--- 629,634 ----