diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-25 22:41:01 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-26 10:15:13 +1100 |
| commit | 69334996ae203c51c70bf01d414c918a44618f8e (patch) | |
| tree | 49c989200f7fe21406efa34ed341601079a75d25 | |
| parent | bf986a9e2792555e0879a3145fa18d2b49436c74 (diff) | |
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
| -rw-r--r-- | serverloop.c | 5 | ||||
| -rw-r--r-- | sshd_config.5 | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index e16eabe2..a8c99e2e 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.220 2020/01/25 04:48:26 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.221 2020/01/25 22:41:01 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -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 d47cb0d2..2cddbd59 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,7 +33,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.301 2020/01/25 22:36:22 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.302 2020/01/25 22:41:01 djm Exp $ .Dd $Mdocdate: January 25 2020 $ .Dt SSHD_CONFIG 5 .Os @@ -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, |