diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | channels.c | 11 |
2 files changed, 12 insertions, 3 deletions
@@ -4,6 +4,10 @@ | |||
4 | - Revert __snprintf -> snprintf aliasing. Apparently Solaris | 4 | - Revert __snprintf -> snprintf aliasing. Apparently Solaris |
5 | __snprintf isn't. Report from Theo de Raadt <theo@cvs.openbsd.org> | 5 | __snprintf isn't. Report from Theo de Raadt <theo@cvs.openbsd.org> |
6 | - Document location of Redhat PAM file in INSTALL. | 6 | - Document location of Redhat PAM file in INSTALL. |
7 | - Fixed X11 forwarding bug on Linux. libc advertises AF_INET6 | ||
8 | INADDR_ANY_INIT addresses via getaddrinfo, but may not be able to | ||
9 | deliver (no IPv6 kernel kernel support) | ||
10 | - Released 1.2.1pre27 | ||
7 | 11 | ||
8 | 20000116 | 12 | 20000116 |
9 | - Renamed --with-xauth-path to --with-xauth | 13 | - Renamed --with-xauth-path to --with-xauth |
diff --git a/channels.c b/channels.c index c4f54a88f..ba4c2bef9 100644 --- a/channels.c +++ b/channels.c | |||
@@ -16,7 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | RCSID("$Id: channels.c,v 1.15 2000/01/14 04:45:48 damien Exp $"); | 19 | RCSID("$Id: channels.c,v 1.16 2000/01/17 02:22:55 damien Exp $"); |
20 | 20 | ||
21 | #include "ssh.h" | 21 | #include "ssh.h" |
22 | #include "packet.h" | 22 | #include "packet.h" |
@@ -1187,8 +1187,13 @@ x11_create_display_inet(int screen_number, int x11_display_offset) | |||
1187 | continue; | 1187 | continue; |
1188 | sock = socket(ai->ai_family, SOCK_STREAM, 0); | 1188 | sock = socket(ai->ai_family, SOCK_STREAM, 0); |
1189 | if (sock < 0) { | 1189 | if (sock < 0) { |
1190 | error("socket: %.100s", strerror(errno)); | 1190 | if (errno != EINVAL) { |
1191 | return NULL; | 1191 | error("socket: %.100s", strerror(errno)); |
1192 | return NULL; | ||
1193 | } else { | ||
1194 | debug("Socket family %d not supported [X11 disp create]", ai->ai_family); | ||
1195 | continue; | ||
1196 | } | ||
1192 | } | 1197 | } |
1193 | if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { | 1198 | if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { |
1194 | debug("bind port %d: %.100s", port, strerror(errno)); | 1199 | debug("bind port %d: %.100s", port, strerror(errno)); |