diff options
| author | Damien Miller <djm@mindrot.org> | 2009-11-18 07:48:30 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2009-11-18 07:48:30 +0100 |
| commit | 04ee0f8f12ff3a1227439c5f67623547d7a5bd11 (patch) | |
| tree | c434c075dc85b9eead1e2e8ac2a1046cf7c42417 /channels.c | |
| parent | - (dtucker) [authfile.c] Fall back to 3DES for the encryption of private (diff) | |
| download | openssh-04ee0f8f12ff3a1227439c5f67623547d7a5bd11.tar.xz openssh-04ee0f8f12ff3a1227439c5f67623547d7a5bd11.zip | |
- (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to
set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify
setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only()
report and fix from jan.kratochvil AT redhat.com
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/channels.c b/channels.c index e8b8aa07e..22e7f628b 100644 --- a/channels.c +++ b/channels.c @@ -2577,6 +2577,8 @@ channel_setup_fwd_listener(int type, const char *listen_addr, } channel_set_reuseaddr(sock); + if (ai->ai_family == AF_INET6) + sock_set_v6only(sock); debug("Local forwarding listening on %s port %s.", ntop, strport); @@ -3108,13 +3110,8 @@ 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 (ai->ai_family == AF_INET6) + sock_set_v6only(sock); if (x11_use_localhost) channel_set_reuseaddr(sock); if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { |