9fb40d132b
- curve25519 key exchange fix (-curve25519-6.6.1p1.patch)
- patch re-ordering (-audit3-key_auth_usage-fips.patch,
-audit4-kex_results-fips.patch)
OBS-URL: https://build.opensuse.org/request/show/231427
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=80
35 lines
957 B
Diff
35 lines
957 B
Diff
# HG changeset patch
|
|
# Parent 1055b218140c3cc19228c47878a68740363d80dd
|
|
Do not throw away already open sockets for X11 forwarding if another socket
|
|
family is not available for bind()
|
|
|
|
diff --git a/openssh-6.6p1/channels.c b/openssh-6.6p1/channels.c
|
|
--- a/openssh-6.6p1/channels.c
|
|
+++ b/openssh-6.6p1/channels.c
|
|
@@ -3476,22 +3476,24 @@ 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);
|
|
-
|
|
+ continue;
|
|
+ /* do not remove successfully opened sockets
|
|
for (n = 0; n < num_socks; n++) {
|
|
close(socks[n]);
|
|
}
|
|
num_socks = 0;
|
|
break;
|
|
+ */
|
|
}
|
|
socks[num_socks++] = sock;
|
|
if (num_socks == NUM_SOCKS)
|
|
break;
|
|
}
|
|
freeaddrinfo(aitop);
|
|
if (num_socks > 0)
|
|
break;
|