Attachment 1883 Details for Bug 1787 – v6only.diff

[patch] v6only.diff

v6only.diff (text/plain), 1.06 KB, created by Damien Miller on 2010-06-23 06:18:02 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2010-06-23 06:18:02 AEST

Size: 1.06 KB

patch

obsolete

>Index: misc.c
>===================================================================
>RCS file: /var/cvs/openssh/misc.c,v
>retrieving revision 1.99
>diff -u -p -r1.99 misc.c
>--- misc.c	9 Jan 2010 23:31:12 -0000	1.99
>+++ misc.c	22 Jun 2010 20:16:40 -0000
>@@ -857,6 +857,6 @@ sock_set_v6only(int s)
> 
> 	debug3("%s: set socket %d IPV6_V6ONLY", __func__, s);
> 	if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) == -1)
>-		error("setsockopt IPV6_V6ONLY: %s", strerror(errno));
>+		debug("setsockopt IPV6_V6ONLY: %s", strerror(errno));
> #endif
> }
>Index: channels.c
>===================================================================
>RCS file: /var/cvs/openssh/channels.c,v
>retrieving revision 1.295
>diff -u -p -r1.295 channels.c
>--- channels.c	21 May 2010 04:57:10 -0000	1.295
>+++ channels.c	22 Jun 2010 20:16:54 -0000
>@@ -2735,8 +2735,7 @@ channel_setup_fwd_listener(int type, con
> 		}
> 
> 		channel_set_reuseaddr(sock);
>-		if (ai->ai_family == AF_INET6)
>-			sock_set_v6only(sock);
>+		sock_set_v6only(sock);
> 
> 		debug("Local forwarding listening on %s port %s.",
> 		    ntop, strport);

Actions: View | Diff

Attachments on bug 1787: 1883