===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.307
retrieving revision 1.308
diff -c -r1.307 -r1.308
*** src/usr.bin/tmux/server-client.c	2020/03/16 06:12:42	1.307
--- src/usr.bin/tmux/server-client.c	2020/03/17 11:10:12	1.308
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.307 2020/03/16 06:12:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.308 2020/03/17 11:10:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 400,405 ****
--- 400,407 ----
  		shell = options_get_string(s->options, "default-shell");
  	else
  		shell = options_get_string(global_s_options, "default-shell");
+ 	if (!checkshell(shell))
+ 		shell = _PATH_BSHELL;
  	shellsize = strlen(shell) + 1;
  
  	msg = xmalloc(cmdsize + shellsize);
***************
*** 2009,2015 ****
  	const char	*shell;
  
  	shell = options_get_string(global_s_options, "default-shell");
! 	if (*shell == '\0' || areshell(shell))
  		shell = _PATH_BSHELL;
  	proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1);
  
--- 2011,2017 ----
  	const char	*shell;
  
  	shell = options_get_string(global_s_options, "default-shell");
! 	if (!checkshell(shell))
  		shell = _PATH_BSHELL;
  	proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1);