diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 05:37:55 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 05:37:55 +0000 |
| commit | 085377d0cee4cd384fd4bbb67ec162bf8e4367cb (patch) | |
| tree | 371f72295843f8b4cfb6740441673e202bb29b2a /debian/patches/bug2918.patch | |
| parent | Releasing progress-linux version 1:7.9p1-10+deb10u2progress5u1. (diff) | |
| download | openssh-085377d0cee4cd384fd4bbb67ec162bf8e4367cb.tar.xz openssh-085377d0cee4cd384fd4bbb67ec162bf8e4367cb.zip | |
Merging debian version 1:7.9p1-10+deb10u3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/bug2918.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/bug2918.patch b/debian/patches/bug2918.patch new file mode 100644 index 0000000..751259c --- /dev/null +++ b/debian/patches/bug2918.patch @@ -0,0 +1,26 @@ +Description: ssh(1): Fix bad interaction between the ssh_config ConnectTimeout and ConnectionAttempts directives + Connection attempts after the first were ignoring the requested timeout +Origin: upstream, https://bugzilla.mindrot.org/attachment.cgi?id=3233 +Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2918 +Forwarded: no +Last-Update: 2023-03-29 + +--- a/sshconnect.c ++++ b/sshconnect.c +@@ -500,7 +500,7 @@ + struct sockaddr_storage *hostaddr, u_short port, int family, + int connection_attempts, int *timeout_ms, int want_keepalive) + { +- int on = 1; ++ int on = 1, saved_timeout_ms = *timeout_ms; + int oerrno, sock = -1, attempt; + char ntop[NI_MAXHOST], strport[NI_MAXSERV]; + struct addrinfo *ai; +@@ -544,6 +544,7 @@ + continue; + } + ++ *timeout_ms = saved_timeout_ms; + if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen, + timeout_ms) >= 0) { + /* Successful connection. */ |