diff options
| author |   stsp <stsp@openbsd.org> | 2012-09-07 09:55:18 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2012-09-07 09:55:18 +0000 |
| commit | 80ed7ffcbdcdef40154d80e2ad6b7b91e205cc9d (patch) | |
| tree | 64b60de14a2c6fd69eb2f2a7ea7ac5f61807fc21 | |
| parent | when muxmaster is run with -N, make it shut down gracefully when a client (diff) | |
| download | wireguard-openbsd-80ed7ffcbdcdef40154d80e2ad6b7b91e205cc9d.tar.xz wireguard-openbsd-80ed7ffcbdcdef40154d80e2ad6b7b91e205cc9d.zip | |
Create IPv6 privacy addresses even if static IPv6 addresses are present.
Restores the ability to use privacy addresses for outgoing connections and
static addresses for incoming connections, which was broken by r1.62.
ok sperreault@
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 9b84a6f7ade..d8ce6e06ed5 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.63 2012/09/04 10:03:16 stsp Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.64 2012/09/07 09:55:18 stsp Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -1275,7 +1275,8 @@ prelist_update(struct nd_prefix *new, struct nd_defrouter *dr, struct mbuf *m) } if ((!autoconf || ((ifp->if_xflags & IFXF_INET6_NOPRIVACY) == 0 && - !tempaddr_preferred)) && new->ndpr_vltime != 0 && !statique) { + !tempaddr_preferred)) && new->ndpr_vltime != 0 && + !((ifp->if_xflags & IFXF_INET6_NOPRIVACY) && statique)) { /* * There is no SLAAC address and/or there is no preferred RFC * 4941 temporary address. And the valid prefix lifetime is |