From 7c20c7ece80c05b6f97d3f2478143b973a2f4f9c Mon Sep 17 00:00:00 2001 From: djm Date: Mon, 21 Aug 2023 04:59:54 +0000 Subject: [PATCH] correct math for ClientAliveInterval that caused the probes to be sent less frequently than configured; from Dawid Majchrzak --- usr.bin/ssh/serverloop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 0c13f9b87ab..c669c02ee8d 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.236 2023/03/08 04:43:12 guenther Exp $ */ +/* $OpenBSD: serverloop.c,v 1.237 2023/08/21 04:59:54 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -247,7 +247,7 @@ wait_until_can_do_something(struct ssh *ssh, /* ClientAliveInterval probing */ if (client_alive_scheduled) { if (ret == 0 && - now > last_client_time + options.client_alive_interval) { + now >= last_client_time + options.client_alive_interval) { /* ppoll timed out and we're due to probe */ client_alive_check(ssh); last_client_time = now; -- 2.20.1