Tidy merge.

This commit is contained in:
Simon Kelley
2012-12-04 20:55:54 +00:00
parent 36bec089f7
commit f7fe362721

View File

@@ -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)