===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-session.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/cmd-kill-session.c	2014/10/20 22:29:25	1.14
--- src/usr.bin/tmux/cmd-kill-session.c	2015/09/16 22:40:27	1.15
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-session.c,v 1.14 2014/10/20 22:29:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-kill-session.c,v 1.15 2015/09/16 22:40:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 41,56 ****
  cmd_kill_session_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
! 	struct session	*s, *s2, *s3;
  
  	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	if (args_has(args, 'a')) {
! 		RB_FOREACH_SAFE(s2, sessions, &sessions, s3) {
! 			if (s != s2) {
! 				server_destroy_session(s2);
! 				session_destroy(s2);
  			}
  		}
  	} else {
--- 41,56 ----
  cmd_kill_session_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
! 	struct session	*s, *sloop, *stmp;
  
  	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	if (args_has(args, 'a')) {
! 		RB_FOREACH_SAFE(sloop, sessions, &sessions, stmp) {
! 			if (sloop != s) {
! 				server_destroy_session(sloop);
! 				session_destroy(sloop);
  			}
  		}
  	} else {