diff options
| author |   mpi <mpi@openbsd.org> | 2015-08-12 09:06:18 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-08-12 09:06:18 +0000 |
| commit | 79a97159eaa7b1ccd2cfbb17acb756bdf1e59d91 (patch) | |
| tree | 127d90d58dfbece48ba8f1e94f50b864b63c6225 | |
| parent | Rename left/right/up/down relative to active pane to add -of suffix (diff) | |
| download | wireguard-openbsd-79a97159eaa7b1ccd2cfbb17acb756bdf1e59d91.tar.xz wireguard-openbsd-79a97159eaa7b1ccd2cfbb17acb756bdf1e59d91.zip | |
Remove backward compatibilify goos for IN6_IFF_DEPRECATED and instead
reject SIOCAIFADDR_IN6 ioctl(2) where it is set.
ok jca@, bluhm@
| -rw-r--r-- | sys/netinet6/in6.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index b0671de01c4..91d2703e604 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.161 2015/07/18 15:05:32 mpi Exp $ */ +/* $OpenBSD: in6.c,v 1.162 2015/08/12 09:06:18 mpi Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -469,6 +469,7 @@ in6_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp) if ((ifra->ifra_flags & IN6_IFF_DUPLICATED) != 0 || (ifra->ifra_flags & IN6_IFF_DETACHED) != 0 || (ifra->ifra_flags & IN6_IFF_NODAD) != 0 || + (ifra->ifra_flags & IN6_IFF_DEPRECATED) != 0 || (ifra->ifra_flags & IN6_IFF_AUTOCONF) != 0) { return (EINVAL); } @@ -760,14 +761,6 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra, */ ia6->ia6_flags = ifra->ifra_flags; /* - * backward compatibility - if IN6_IFF_DEPRECATED is set from the - * userland, make it deprecated. - */ - if ((ifra->ifra_flags & IN6_IFF_DEPRECATED) != 0) { - ia6->ia6_lifetime.ia6t_pltime = 0; - ia6->ia6_lifetime.ia6t_preferred = time_second; - } - /* * Make the address tentative before joining multicast addresses, * so that corresponding MLD responses would not have a tentative * source address. |