Module Name: src Committed By: roy Date: Fri Aug 26 19:53:07 UTC 2016
Modified Files: src/sys/netinet6: in6_pcb.c raw_ip6.c Log Message: Allow explicit binding to detached addresss. Fixes PR kern/51435. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/netinet6/in6_pcb.c cvs rdiff -u -r1.149 -r1.150 src/sys/netinet6/raw_ip6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet6/in6_pcb.c diff -u src/sys/netinet6/in6_pcb.c:1.148 src/sys/netinet6/in6_pcb.c:1.149 --- src/sys/netinet6/in6_pcb.c:1.148 Mon Aug 1 03:15:31 2016 +++ src/sys/netinet6/in6_pcb.c Fri Aug 26 19:53:07 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in6_pcb.c,v 1.148 2016/08/01 03:15:31 ozaki-r Exp $ */ +/* $NetBSD: in6_pcb.c,v 1.149 2016/08/26 19:53:07 roy Exp $ */ /* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.148 2016/08/01 03:15:31 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.149 2016/08/26 19:53:07 roy Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -271,7 +271,7 @@ in6_pcbbind_addr(struct in6pcb *in6p, st */ if (ifa && ifatoia6(ifa)->ia6_flags & - (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED)) { + (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY)) { error = EADDRNOTAVAIL; goto out; } Index: src/sys/netinet6/raw_ip6.c diff -u src/sys/netinet6/raw_ip6.c:1.149 src/sys/netinet6/raw_ip6.c:1.150 --- src/sys/netinet6/raw_ip6.c:1.149 Mon Aug 1 03:15:31 2016 +++ src/sys/netinet6/raw_ip6.c Fri Aug 26 19:53:07 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip6.c,v 1.149 2016/08/01 03:15:31 ozaki-r Exp $ */ +/* $NetBSD: raw_ip6.c,v 1.150 2016/08/26 19:53:07 roy Exp $ */ /* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.149 2016/08/01 03:15:31 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.150 2016/08/26 19:53:07 roy Exp $"); #ifdef _KERNEL_OPT #include "opt_ipsec.h" @@ -700,8 +700,7 @@ rip6_bind(struct socket *so, struct sock goto out; } if (ifa && (ifatoia6(ifa))->ia6_flags & - (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY| - IN6_IFF_DETACHED|IN6_IFF_DEPRECATED)) { + (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY)) { error = EADDRNOTAVAIL; goto out; }