summaryrefslogtreecommitdiffstats
path: root/ipv6nd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2015-01-08 13:31:42 +0000
committerRoy Marples <roy@marples.name>2015-01-08 13:31:42 +0000
commit62f12387ac7944e54d05a96cbb300165f064fb86 (patch)
tree75129c86920fa85fe83786fb9c2ca878db242338 /ipv6nd.c
parent7e651353d1dfa4314fe2bbc8a76ace414c3ebf82 (diff)
downloaddhcpcd-62f12387ac7944e54d05a96cbb300165f064fb86.tar.xz
Add an option to disable the generation of autoconf addresses within a RA.
Diffstat (limited to 'ipv6nd.c')
-rw-r--r--ipv6nd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipv6nd.c b/ipv6nd.c
index 88b224db..b7081537 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -864,7 +864,9 @@ ipv6nd_handlera(struct ipv6_ctx *ctx, struct interface *ifp,
ap->prefix_len = pi->nd_opt_pi_prefix_len;
ap->prefix = pi->nd_opt_pi_prefix;
if (pi->nd_opt_pi_flags_reserved &
- ND_OPT_PI_FLAG_AUTO)
+ ND_OPT_PI_FLAG_AUTO &&
+ ap->iface->options->options &
+ DHCPCD_IPV6RA_AUTOCONF)
{
ap->flags |= IPV6_AF_AUTOCONF;
ap->dadcounter =