2 files changed, 18 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a9a39e057..7565ddd2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020604
+ - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
+   setsockopt from debug to error for now).
+
 20020527
  - (tim) [configure.ac.orig monitor_fdpass.c] Enahnce msghdr tests to address
    build problem on Irix reported by Dave Love <d.love@dl.ac.uk>. Back out
@@ -677,4 +681,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2142 2002/05/28 00:37:32 tim Exp $
+$Id: ChangeLog,v 1.2143 2002/06/04 20:52:19 stevesk Exp $
diff --git a/channels.c b/channels.c
index 520bff822..3ac690135 100644
--- a/channels.c
+++ b/channels.c
@@ -2374,6 +2374,13 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                                         continue;
                                 }
                         }
+#ifdef IPV6_V6ONLY
+                        if (ai->ai_family == AF_INET6) {
+                                int on = 1;
+                                if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0)
+                                        error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno));
+                        }
+#endif
                         if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
                                 debug("bind port %d: %.100s", port, strerror(errno));
                                 close(sock);
@@ -2392,7 +2399,12 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                         if (num_socks == NUM_SOCKS)
                                 break;
 #else
-                        break;
+                        if (x11_use_localhost) {
+                                if (num_socks == NUM_SOCKS)
+                                        break;
+                        } else {
+                                break;
+                        }
 #endif
                 }
                 freeaddrinfo(aitop);