mirror of
https://github.com/pi-hole/dnsmasq.git
synced 2025-12-19 18:28:25 +00:00
Tidy merge.
This commit is contained in:
@@ -485,7 +485,7 @@ time_t periodic_ra(time_t now)
|
|||||||
context->ra_time = 0;
|
context->ra_time = 0;
|
||||||
else if (param.iface != 0 &&
|
else if (param.iface != 0 &&
|
||||||
indextoname(daemon->icmp6fd, param.iface, interface) &&
|
indextoname(daemon->icmp6fd, param.iface, interface) &&
|
||||||
iface_check(AF_LOCAL, NULL, interface))
|
iface_check(AF_LOCAL, NULL, interface, NULL))
|
||||||
{
|
{
|
||||||
struct iname *tmp;
|
struct iname *tmp;
|
||||||
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
||||||
|
|||||||
Reference in New Issue
Block a user