Merge branch 'master' into dnssec

This commit is contained in:
Simon Kelley
2013-11-14 10:39:40 +00:00
15 changed files with 353 additions and 188 deletions

View File

@@ -274,6 +274,9 @@ int main (int argc, char **argv)
/* after enumerate_interfaces() */
if (daemon->doing_dhcp6 || daemon->relay6 || daemon->doing_ra)
join_multicast(1);
/* After netlink_init() and before create_helper() */
lease_make_duid(now);
#endif
if (daemon->port != 0)