2012-02-14 15:55:51 +00:00
|
|
|
diff -up openssh-5.6p1/channels.c.getaddrinfo openssh-5.6p1/channels.c
|
|
|
|
|
--- openssh-5.6p1/channels.c.getaddrinfo 2012-02-14 16:12:54.427852524 +0100
|
|
|
|
|
+++ openssh-5.6p1/channels.c 2012-02-14 16:13:22.818928690 +0100
|
|
|
|
|
@@ -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
|
2011-04-27 10:16:14 +00:00
|
|
|
memset(&hints, 0, sizeof(hints));
|
|
|
|
|
hints.ai_family = family;
|
|
|
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
|
|
|
+ hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
|
|
|
|
|
snprintf(strport, sizeof strport, "%u", port);
|
|
|
|
|
if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
|
|
|
|
|
fatal("%s: Could not resolve hostname %.100s: %s", __progname,
|
