commit 8445f5d2e2cf224edc71b896189a6526e58ec463
author Simon Kelley <simon@thekelleys.org.uk> Mon Dec 17 21:54:08 2012 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Tue Dec 18 18:31:11 2012 +0000
tree a92d82fd1bde25d716815d0ffd2194a3f8289e84
parent 72c9c3b11bbc448144210abc5fb8ba89813d2fdf

Fix initialisation order.

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 7a9d340..4e2165b 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -210,9 +210,8 @@
 #endif
 
 #ifdef HAVE_LINUX_NETWORK
-  /* After lease_init */
   netlink_init();
-
+  
   if (option_bool(OPT_NOWILD) && option_bool(OPT_CLEVERBIND))
     die(_("cannot set --bind-interfaces and --bind-dynamic"), NULL, EC_BADCONF);
 #endif
@@ -222,13 +221,7 @@
   if (daemon->doing_dhcp6 || daemon->doing_ra)
     join_multicast();
 #endif
-
-#ifdef HAVE_DHCP
-  /* after netlink_init */
-  if (daemon->dhcp || daemon->doing_dhcp6)
-    lease_find_interfaces(now);
-#endif
-
+  
   if (!enumerate_interfaces())
     die(_("failed to find list of interfaces: %s"), NULL, EC_MISC);
   
@@ -650,6 +643,9 @@
     my_syslog(MS_DHCP | LOG_INFO, _("IPv6 router advertisement enabled"));
 #  endif
 
+  /* after dhcp_contruct_contexts */
+  if (daemon->dhcp || daemon->doing_dhcp6)
+    lease_find_interfaces(now);
 #endif
 
 #ifdef HAVE_TFTP