56e0af8154
temporarily downgrading to 7.2p2 to run tests on additional 7.2p2 patches OBS-URL: https://build.opensuse.org/request/show/547144 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=124
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
# HG changeset patch
|
|
# Parent a9e60634acb905a830a0f57ece296781ab08d0fb
|
|
Do not throw away already open sockets for X11 forwarding if another socket
|
|
family is not available for bind()
|
|
|
|
diff --git a/openssh-7.2p2/channels.c b/openssh-7.2p2/channels.c
|
|
--- a/openssh-7.2p2/channels.c
|
|
+++ b/openssh-7.2p2/channels.c
|
|
@@ -3938,16 +3938,25 @@ x11_create_display_inet(int x11_display_
|
|
if (ai->ai_family == AF_INET6)
|
|
sock_set_v6only(sock);
|
|
if (x11_use_localhost)
|
|
channel_set_reuseaddr(sock);
|
|
if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
|
|
debug2("bind port %d: %.100s", port, strerror(errno));
|
|
close(sock);
|
|
|
|
+ /* do not remove successfully opened
|
|
+ * sockets if the request failed because
|
|
+ * the protocol IPv4/6 is not available
|
|
+ * (e.g. IPv6 may be disabled while being
|
|
+ * supported)
|
|
+ */
|
|
+ if (EADDRNOTAVAIL == errno)
|
|
+ continue;
|
|
+
|
|
for (n = 0; n < num_socks; n++) {
|
|
close(socks[n]);
|
|
}
|
|
num_socks = 0;
|
|
break;
|
|
}
|
|
socks[num_socks++] = sock;
|
|
if (num_socks == NUM_SOCKS)
|