summaryrefslogtreecommitdiff
path: root/openssh-8.2p1-x11-without-ipv6.patch
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-07-03 02:42:38 +0000
committerCoprDistGit <infra@openeuler.org>2024-07-03 02:42:38 +0000
commit3c362eae690284f325824e38431881825e32ffdd (patch)
treed2d0e11b92bf88d35c270559d268845d391a4703 /openssh-8.2p1-x11-without-ipv6.patch
parent62f0a34c39a6846b6a86f2bbc7fb8c319bd46d94 (diff)
automatic import of openssh
Diffstat (limited to 'openssh-8.2p1-x11-without-ipv6.patch')
-rw-r--r--openssh-8.2p1-x11-without-ipv6.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/openssh-8.2p1-x11-without-ipv6.patch b/openssh-8.2p1-x11-without-ipv6.patch
deleted file mode 100644
index 8b83bc3..0000000
--- a/openssh-8.2p1-x11-without-ipv6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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_f("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)
- break;