diff options
| author |   djm <djm@openbsd.org> | 2019-03-27 09:29:14 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-03-27 09:29:14 +0000 |
| commit | a43db1b08276b0593a2c67baeee9378b3fea25dd (patch) | |
| tree | 23fd6b5aab2c5e47ec9c285c896bf90aa63ea6ba /usr.bin/ssh/serverloop.c | |
| parent | Add AR8152 PCI ids to alc_phy_down(), based on FreeBSD r272730. (diff) | |
| download | wireguard-openbsd-a43db1b08276b0593a2c67baeee9378b3fea25dd.tar.xz wireguard-openbsd-a43db1b08276b0593a2c67baeee9378b3fea25dd.zip | |
fix interaction between ClientAliveInterval and RekeyLimit that could
cause connection to close incorrectly; Report and patch from Jakub
Jelen in bz#2757; ok dtucker@ markus@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 05a2de3392a..3cd54788720 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.214 2019/03/06 21:06:59 dtucker Exp $ */ +/* $OpenBSD: serverloop.c,v 1.215 2019/03/27 09:29:14 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -244,9 +244,10 @@ wait_until_can_do_something(struct ssh *ssh, uint64_t keepalive_ms = (uint64_t)options.client_alive_interval * 1000; - client_alive_scheduled = 1; - if (max_time_ms == 0 || max_time_ms > keepalive_ms) + if (max_time_ms == 0 || max_time_ms > keepalive_ms) { max_time_ms = keepalive_ms; + client_alive_scheduled = 1; + } } #if 0 |