summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-12-27 09:40:21 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2016-12-27 09:52:40 +0100
commit8dc2a59dcaef51be41cf82621c0e00eac88074aa (patch)
tree681383660fce44dcad35fba175880b7515e90565
parent93ab25b2160ac8a2da6d5dc6ead003e9b8abf9c7 (diff)
Revert "Respect interface "ignore" settings as documented."
This reverts commit 5f425ed1e5f92397e27ec4f44820b6ef677b8134. Both dnsmasq and odhcpd use the ignore option. This is fine for normal operation, but it breaks DHCPv6 relay when dnsmasq is disabled on the wan interface. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
-rw-r--r--src/config.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/config.c b/src/config.c
index 372ea67..a3cb2be 100644
--- a/src/config.c
+++ b/src/config.c
@@ -697,10 +697,10 @@ void odhcpd_reload(void)
i->ndp = (master && master->ndp == RELAYD_RELAY) ?
RELAYD_RELAY : RELAYD_DISABLED;
- setup_router_interface(i, !i->ignore);
- setup_dhcpv6_interface(i, !i->ignore);
- setup_ndp_interface(i, !i->ignore);
- setup_dhcpv4_interface(i, !i->ignore);
+ setup_router_interface(i, true);
+ setup_dhcpv6_interface(i, true);
+ setup_ndp_interface(i, true);
+ setup_dhcpv4_interface(i, true);
} else {
close_interface(i);
}