===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/tmux/server.c	2009/08/31 20:46:19	1.26
--- src/usr.bin/tmux/server.c	2009/09/02 21:25:57	1.27
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.26 2009/08/31 20:46:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.27 2009/09/02 21:25:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 202,209 ****
  	server_write_error(c, cause);
  	xfree(cause);
  
  	server_shutdown();
- 	c->flags |= CLIENT_BAD;
  
  	exit(server_main(srv_fd));
  }
--- 202,209 ----
  	server_write_error(c, cause);
  	xfree(cause);
  
+ 	sigterm = 1;
  	server_shutdown();
  
  	exit(server_main(srv_fd));
  }
***************
*** 304,310 ****
  
  		/* Update socket permissions. */
  		xtimeout = INFTIM;
! 		if (sigterm || server_update_socket() != 0)
  			xtimeout = POLL_TIMEOUT;
  
  		/* Do the poll. */
--- 304,310 ----
  
  		/* Update socket permissions. */
  		xtimeout = INFTIM;
! 		if (server_update_socket() != 0)
  			xtimeout = POLL_TIMEOUT;
  
  		/* Do the poll. */
***************
*** 420,426 ****
  				server_lost_client(c);
  			else
  				server_write_client(c, MSG_SHUTDOWN, NULL, 0);
- 			c->flags |= CLIENT_BAD;
  		}
  	}
  }
--- 420,425 ----