projects
/
oweals
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
93ab25b
)
Revert "Respect interface "ignore" settings as documented."
author
Stijn Tintel
<stijn@linux-ipv6.be>
Tue, 27 Dec 2016 08:40:21 +0000
(09:40 +0100)
committer
Stijn Tintel
<stijn@linux-ipv6.be>
Tue, 27 Dec 2016 08:52:40 +0000
(09:52 +0100)
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>
src/config.c
patch
|
blob
|
history
diff --git
a/src/config.c
b/src/config.c
index 372ea6782701630f0b9b02da12e1f22b06996273..a3cb2bec3e3ec5ec202b053e4ca577da3aef1207 100644
(file)
--- 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->ignor
e);
- setup_dhcpv6_interface(i,
!i->ignor
e);
- setup_ndp_interface(i,
!i->ignor
e);
- setup_dhcpv4_interface(i,
!i->ignor
e);
+ setup_router_interface(i,
tru
e);
+ setup_dhcpv6_interface(i,
tru
e);
+ setup_ndp_interface(i,
tru
e);
+ setup_dhcpv4_interface(i,
tru
e);
} else {
close_interface(i);
}