Look for x11 forward sockets with AI_ADDRCONFIG flag getaddrinfo (#735889)
This commit is contained in:
parent
d3ab95741d
commit
feb99ea644
@ -1,7 +1,20 @@
|
|||||||
diff -up openssh-5.8p1/sshconnect.c.getaddrinfo openssh-5.8p1/sshconnect.c
|
diff -up openssh-5.6p1/channels.c.getaddrinfo openssh-5.6p1/channels.c
|
||||||
--- openssh-5.8p1/sshconnect.c.getaddrinfo 2011-04-27 09:51:44.521384633 +0200
|
--- openssh-5.6p1/channels.c.getaddrinfo 2012-02-14 16:12:54.427852524 +0100
|
||||||
+++ openssh-5.8p1/sshconnect.c 2011-04-27 09:53:21.224443308 +0200
|
+++ openssh-5.6p1/channels.c 2012-02-14 16:13:22.818928690 +0100
|
||||||
@@ -355,6 +355,7 @@ ssh_connect(const char *host, struct soc
|
@@ -3275,6 +3275,9 @@ x11_create_display_inet(int x11_display_
|
||||||
|
memset(&hints, 0, sizeof(hints));
|
||||||
|
hints.ai_family = IPv4or6;
|
||||||
|
hints.ai_flags = x11_use_localhost ? 0: AI_PASSIVE;
|
||||||
|
+#ifdef AI_ADDRCONFIG
|
||||||
|
+ hints.ai_flags |= AI_ADDRCONFIG;
|
||||||
|
+#endif
|
||||||
|
hints.ai_socktype = SOCK_STREAM;
|
||||||
|
snprintf(strport, sizeof strport, "%d", port);
|
||||||
|
if ((gaierr = getaddrinfo(NULL, strport, &hints, &aitop)) != 0) {
|
||||||
|
diff -up openssh-5.6p1/sshconnect.c.getaddrinfo openssh-5.6p1/sshconnect.c
|
||||||
|
--- openssh-5.6p1/sshconnect.c.getaddrinfo 2012-02-14 16:09:25.057964291 +0100
|
||||||
|
+++ openssh-5.6p1/sshconnect.c 2012-02-14 16:09:25.106047007 +0100
|
||||||
|
@@ -343,6 +343,7 @@ ssh_connect(const char *host, struct soc
|
||||||
memset(&hints, 0, sizeof(hints));
|
memset(&hints, 0, sizeof(hints));
|
||||||
hints.ai_family = family;
|
hints.ai_family = family;
|
||||||
hints.ai_socktype = SOCK_STREAM;
|
hints.ai_socktype = SOCK_STREAM;
|
||||||
|
@ -112,6 +112,7 @@ Patch100: openssh-5.9p1-coverity.patch
|
|||||||
#https://bugzilla.mindrot.org/show_bug.cgi?id=1872
|
#https://bugzilla.mindrot.org/show_bug.cgi?id=1872
|
||||||
Patch101: openssh-5.8p1-fingerprint.patch
|
Patch101: openssh-5.8p1-fingerprint.patch
|
||||||
#https://bugzilla.mindrot.org/show_bug.cgi?id=1894
|
#https://bugzilla.mindrot.org/show_bug.cgi?id=1894
|
||||||
|
#https://bugzilla.redhat.com/show_bug.cgi?id=735889
|
||||||
Patch102: openssh-5.8p1-getaddrinfo.patch
|
Patch102: openssh-5.8p1-getaddrinfo.patch
|
||||||
#https://bugzilla.mindrot.org/show_bug.cgi?id=1889
|
#https://bugzilla.mindrot.org/show_bug.cgi?id=1889
|
||||||
Patch103: openssh-5.8p1-packet.patch
|
Patch103: openssh-5.8p1-packet.patch
|
||||||
|
Loading…
Reference in New Issue
Block a user