35 lines
957 B
Diff
35 lines
957 B
Diff
|
# HG changeset patch
|
||
|
|
# Parent d7526bd96e81981aa3c94b7695a3f4009a2c176b
|
||
|
|
Do not throw away already open sockets for X11 forwarding if another socket
|
||
|
|
family is not available for bind()
|
||
|
|
|
||
|
|
diff --git a/openssh-6.5p1/channels.c b/openssh-6.5p1/channels.c
|
||
|
|
--- a/openssh-6.5p1/channels.c
|
||
|
|
+++ b/openssh-6.5p1/channels.c
|
||
|
|
@@ -3475,22 +3475,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;
|