From 803e22eabd3ba75485eedd8b7b44d6ace79f2052 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 18 Aug 2023 01:37:41 +0000 Subject: 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 --- kex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kex.c') diff --git a/kex.c b/kex.c index b4e2ab75f..fd04bb0b5 100644 --- a/kex.c +++ b/kex.c @@ -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."); -- cgit v1.2.3