Fix non-response to router-solicitations when

router-advertisement configured, but DHCPv6 not
configured.
This commit is contained in:
Simon Kelley
2012-05-21 14:34:15 +01:00
parent c64b7f6a78
commit 18c63eff8f
2 changed files with 8 additions and 7 deletions

View File

@@ -849,14 +849,11 @@ int main (int argc, char **argv)
}
#ifdef HAVE_DHCP6
if (daemon->dhcp6)
{
if (FD_ISSET(daemon->dhcp6fd, &rset))
dhcp6_packet(now);
if (daemon->dhcp6 && FD_ISSET(daemon->dhcp6fd, &rset))
dhcp6_packet(now);
if (daemon->ra_contexts && FD_ISSET(daemon->icmp6fd, &rset))
icmp6_packet();
}
if (daemon->ra_contexts && FD_ISSET(daemon->icmp6fd, &rset))
icmp6_packet();
#endif
# ifdef HAVE_SCRIPT