From 804b8696a47b37076f8ae0e0b04dcba3e2d1fb7c Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 25 Sep 2009 17:47:42 +0000 Subject: Sync OpenBSD patchset 352: Don't allow locked or suspended clients to limit the size of active clients. --- server.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index cd5acc22..79587080 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.193 2009-09-23 15:10:37 tcunha Exp $ */ +/* $Id: server.c,v 1.194 2009-09-25 17:47:42 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1197,8 +1197,10 @@ server_second_timers(void) t = time(NULL); xtimeout = options_get_number(&global_s_options, "lock-after-time"); - if (xtimeout > 0 && t > server_activity + xtimeout) + if (xtimeout > 0 && t > server_activity + xtimeout) { server_lock(); + recalculate_sizes(); + } for (i = 0; i < ARRAY_LENGTH(&windows); i++) { w = ARRAY_ITEM(&windows, i); -- cgit