===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -c -r1.98 -r1.99
*** src/usr.bin/tmux/server.c	2010/12/30 23:16:18	1.98
--- src/usr.bin/tmux/server.c	2011/01/01 01:12:09	1.99
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.98 2010/12/30 23:16:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.99 2011/01/01 01:12:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 494,505 ****
  
  	t = time(NULL);
  	RB_FOREACH(s, sessions, &sessions) {
! 		if (s->flags & SESSION_UNATTACHED) {
! 			if (gettimeofday(&s->activity_time, NULL) != 0)
! 				fatal("gettimeofday failed");
  			continue;
- 		}
- 
  		timeout = options_get_number(&s->options, "lock-after-time");
  		if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
  			return;	/* not timed out */
--- 494,501 ----
  
  	t = time(NULL);
  	RB_FOREACH(s, sessions, &sessions) {
! 		if (s->flags & SESSION_UNATTACHED)
  			continue;
  		timeout = options_get_number(&s->options, "lock-after-time");
  		if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
  			return;	/* not timed out */
***************
*** 519,530 ****
  
  	t = time(NULL);
  	RB_FOREACH(s, sessions, &sessions) {
! 		if (s->flags & SESSION_UNATTACHED) {
! 			if (gettimeofday(&s->activity_time, NULL) != 0)
! 				fatal("gettimeofday failed");
  			continue;
- 		}
- 
  		timeout = options_get_number(&s->options, "lock-after-time");
  		if (timeout > 0 && t > s->activity_time.tv_sec + timeout) {
  			server_lock_session(s);
--- 515,522 ----
  
  	t = time(NULL);
  	RB_FOREACH(s, sessions, &sessions) {
! 		if (s->flags & SESSION_UNATTACHED)
  			continue;
  		timeout = options_get_number(&s->options, "lock-after-time");
  		if (timeout > 0 && t > s->activity_time.tv_sec + timeout) {
  			server_lock_session(s);