summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-25 22:41:01 +0000
committerDamien Miller <djm@mindrot.org>2020-01-26 10:15:13 +1100
commit69334996ae203c51c70bf01d414c918a44618f8e (patch)
tree49c989200f7fe21406efa34ed341601079a75d25 /serverloop.c
parentbf986a9e2792555e0879a3145fa18d2b49436c74 (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
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c
index e16eabe27..a8c99e2e0 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.220 2020/01/25 04:48:26 djm Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.221 2020/01/25 22:41:01 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -184,7 +184,8 @@ client_alive_check(struct ssh *ssh)
184 int r, channel_id; 184 int r, channel_id;
185 185
186 /* timeout, check to see how many we have had */ 186 /* timeout, check to see how many we have had */
187 if (ssh_packet_inc_alive_timeouts(ssh) > 187 if (options.client_alive_count_max > 0 &&
188 ssh_packet_inc_alive_timeouts(ssh) >
188 options.client_alive_count_max) { 189 options.client_alive_count_max) {
189 sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id)); 190 sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
190 logit("Timeout, client not responding from %s", remote_id); 191 logit("Timeout, client not responding from %s", remote_id);