upstream: correct math for ClientAliveInterval that caused the

probes to be sent less frequently than configured; from Dawid Majchrzak

OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038

diff --git a/serverloop.c b/serverloop.c
index de5fa2e3c2e84e81ee8ab6fbeaec4b34c61fd0bb..f3683c2e4a6d38a2e4cdc1a9790780f84f61cc89 100644 (file)
--- 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@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@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;