===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- src/usr.bin/tmux/server.c	2015/08/28 12:25:42	1.132
+++ src/usr.bin/tmux/server.c	2015/08/28 12:31:55	1.133
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.132 2015/08/28 12:25:42 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.133 2015/08/28 12:31:55 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -64,7 +64,6 @@
 void	server_child_exited(pid_t, int);
 void	server_child_stopped(pid_t, int);
 void	server_second_callback(int, short, void *);
-void	server_lock_server(void);
 void	server_lock_sessions(void);
 
 /* Set marked pane. */
@@ -506,36 +505,12 @@
 {
 	struct timeval		 tv;
 
-	if (options_get_number(&global_s_options, "lock-server"))
-		server_lock_server();
-	else
-		server_lock_sessions();
+	server_lock_sessions();
 
 	evtimer_del(&server_ev_second);
 	memset(&tv, 0, sizeof tv);
 	tv.tv_sec = 1;
 	evtimer_add(&server_ev_second, &tv);
-}
-
-/* Lock the server if ALL sessions have hit the time limit. */
-void
-server_lock_server(void)
-{
-	struct session  *s;
-	int		 timeout;
-	time_t           t;
-
-	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 */
-	}
-
-	server_lock();
-	recalculate_sizes();
 }
 
 /* Lock any sessions which have timed out. */