File openssh-clientalivecount-allow-disable.patch of Package openssh.32616

Overview Repositories Revisions Requests Users Attributes Meta

File openssh-clientalivecount-allow-disable.patch of Package openssh.32616

From 69334996ae203c51c70bf01d414c918a44618f8e Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Sat, 25 Jan 2020 22:41:01 +0000
Subject: [PATCH] upstream: make sshd_config:ClientAliveCountMax=0 disable the

connection killing behaviour, rather than killing the connection after
sending the first liveness test probe (regardless of whether the client was
responsive) bz2627; ok markus

OpenBSD-Commit-ID: 5af79c35f4c9fa280643b6852f524bfcd9bccdaf
---
 serverloop.c  | 5 +++--
 sshd_config.5 | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/serverloop.c b/serverloop.c
index e16eabe277a..a8c99e2e09b 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -184,7 +184,8 @@ client_alive_check(struct ssh *ssh)
 	int r, channel_id;
 
 	/* timeout, check to see how many we have had */
-	if (ssh_packet_inc_alive_timeouts(ssh) >
+	if (options.client_alive_count_max > 0 &&
+	    ssh_packet_inc_alive_timeouts(ssh) >
 	    options.client_alive_count_max) {
 		sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
 		logit("Timeout, client not responding from %s", remote_id);
diff --git a/sshd_config.5 b/sshd_config.5
index d47cb0d24a9..2cddbd59858 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -519,6 +519,9 @@ is set to 15, and
 .Cm ClientAliveCountMax
 is left at the default, unresponsive SSH clients
 will be disconnected after approximately 45 seconds.
+Setting a zero
+.Cm ClientAliveCountMax
+disables connection termination.
 .It Cm ClientAliveInterval
 Sets a timeout interval in seconds after which if no data has been received
 from the client,

Places

File openssh-clientalivecount-allow-disable.patch of Package openssh.32616

Places