81d24c0aa7
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/openssh#a048fcc3d0920b13b79be801efbae08388212c5f
31 lines
848 B
Diff
31 lines
848 B
Diff
diff --git a/channels.c b/channels.c
|
|
--- a/channels.c
|
|
+++ b/channels.c
|
|
@@ -3933,16 +3933,26 @@ x11_create_display_inet(int x11_display_
|
|
if (ai->ai_family == AF_INET6)
|
|
sock_set_v6only(sock);
|
|
if (x11_use_localhost)
|
|
set_reuseaddr(sock);
|
|
if (bind(sock, ai->ai_addr, ai->ai_addrlen) == -1) {
|
|
debug2("%s: bind port %d: %.100s", __func__,
|
|
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)
|
|
break;
|