diff options
| author | Roy Marples <roy@marples.name> | 2015-04-01 22:02:34 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2015-04-01 22:02:34 +0000 |
| commit | 0cfe2784a29a6427ca4978a5744c787e72f96eab (patch) | |
| tree | 8def227d6f69078f2dc94fa33f026bb1dad92286 /dhcpcd.c | |
| parent | a6957da48e30408a426ce7db2fb58e946952cbf2 (diff) | |
| download | dhcpcd-0cfe2784a29a6427ca4978a5744c787e72f96eab.tar.xz | |
Dumping leases should not change kernel IPv6 setup.
Diffstat (limited to 'dhcpcd.c')
| -rw-r--r-- | dhcpcd.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -386,7 +386,9 @@ configure_interface1(struct interface *ifp) ifp->options->options &= ~(DHCPCD_IPV4 | DHCPCD_IPV6RS); /* We want to disable kernel interface RA as early as possible. */ - if (ifo->options & DHCPCD_IPV6RS) { + if (ifo->options & DHCPCD_IPV6RS && + !(ifo->options & DHCPCD_DUMPLEASE)) + { /* If not doing any DHCP, disable the RDNSS requirement. */ if (!(ifo->options & (DHCPCD_DHCP | DHCPCD_DHCP6))) ifo->options &= ~DHCPCD_IPV6RA_REQRDNSS; @@ -397,7 +399,7 @@ configure_interface1(struct interface *ifp) if (ra_global == -1 || ra_iface == -1) ifo->options &= ~DHCPCD_IPV6RS; else if (ra_iface == 0 && - !(ifp->ctx->options & (DHCPCD_DUMPLEASE | DHCPCD_TEST))) + !(ifp->ctx->options & DHCPCD_TEST)) ifo->options |= DHCPCD_IPV6RA_OWN; } |