summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-01-17 13:22:55 +1100
committerDamien Miller <djm@mindrot.org>2000-01-17 13:22:55 +1100
commite219273f93fe94aa188591803be5b9a71afc338a (patch)
treeff2eb0d70ee489d73b382d295ddc3b23d6d4846a
parent95a29b13312eac762002c54fa5799567438b2f95 (diff)
- Fixed X11 forwarding bug on Linux. libc advertises AF_INET6V_1_2_1_PRE27
INADDR_ANY_INIT addresses via getaddrinfo, but may not be able to deliver (no IPv6 kernel kernel support) - Released 1.2.1pre27
-rw-r--r--ChangeLog4
-rw-r--r--channels.c11
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3858b89d..5cd8348f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
- Revert __snprintf -> snprintf aliasing. Apparently Solaris
__snprintf isn't. Report from Theo de Raadt <theo@cvs.openbsd.org>
- Document location of Redhat PAM file in INSTALL.
+ - Fixed X11 forwarding bug on Linux. libc advertises AF_INET6
+ INADDR_ANY_INIT addresses via getaddrinfo, but may not be able to
+ deliver (no IPv6 kernel kernel support)
+ - Released 1.2.1pre27
20000116
- Renamed --with-xauth-path to --with-xauth
diff --git a/channels.c b/channels.c
index c4f54a88..ba4c2bef 100644
--- a/channels.c
+++ b/channels.c
@@ -16,7 +16,7 @@
*/
#include "includes.h"
-RCSID("$Id: channels.c,v 1.15 2000/01/14 04:45:48 damien Exp $");
+RCSID("$Id: channels.c,v 1.16 2000/01/17 02:22:55 damien Exp $");
#include "ssh.h"
#include "packet.h"
@@ -1187,8 +1187,13 @@ x11_create_display_inet(int screen_number, int x11_display_offset)
continue;
sock = socket(ai->ai_family, SOCK_STREAM, 0);
if (sock < 0) {
- error("socket: %.100s", strerror(errno));
- return NULL;
+ if (errno != EINVAL) {
+ error("socket: %.100s", strerror(errno));
+ return NULL;
+ } else {
+ debug("Socket family %d not supported [X11 disp create]", ai->ai_family);
+ continue;
+ }
}
if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
debug("bind port %d: %.100s", port, strerror(errno));