[openssh-commits] [openssh] 01/04: upstream: correct math for ClientAliveInterval that caused the

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 9d7193a8359639801193ad661a59d1ae4dc3d302
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Mon Aug 21 04:59:54 2023 +0000

    upstream: correct math for ClientAliveInterval that caused the
    
    probes to be sent less frequently than configured; from Dawid Majchrzak
    
    OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038
---
 serverloop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/serverloop.c b/serverloop.c
index de5fa2e3..f3683c2e 100644
--- a/serverloop.c
+++ b/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 <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -253,7 +253,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;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.