diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-08-18 03:37:41 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-08-18 04:02:41 +0200 |
| commit | 803e22eabd3ba75485eedd8b7b44d6ace79f2052 (patch) | |
| tree | 8518a57b415c25f65bdf4d87103ee618df2fdcfc /kex.c | |
| parent | upstream: defence-in-depth MaxAuthTries check in monitor; ok markus (diff) | |
| download | openssh-803e22eabd3ba75485eedd8b7b44d6ace79f2052.tar.xz openssh-803e22eabd3ba75485eedd8b7b44d6ace79f2052.zip | |
upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused
multiplexed sessions to ignore SIGINT under some circumstances. Reported by /
feedback naddy@, ok dtucker@
OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a
Diffstat (limited to 'kex.c')
| -rw-r--r-- | kex.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.178 2023/03/12 10:40:39 dtucker Exp $ */ +/* $OpenBSD: kex.c,v 1.179 2023/08/18 01:37:41 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -1334,7 +1334,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, for (;;) { if (timeout_ms > 0) { r = waitrfd(ssh_packet_get_connection_in(ssh), - &timeout_ms); + &timeout_ms, NULL); if (r == -1 && errno == ETIMEDOUT) { send_error(ssh, "Timed out waiting " "for SSH identification string."); |