commit 8dcdb33be9744083bdc7e9586d9de5b125a55a0a
author Julian Kornberger <jk+github@digineo.de> Sat Jul 21 22:11:08 2018 +0100
committer Simon Kelley <simon@thekelleys.org.uk> Sat Jul 21 22:11:08 2018 +0100
tree 44ae8ca1f8ffa4eb1c07f7276f3fef85d581d71b
parent aba8bbb6e3819b712885db211e78f1631cd6ab32

Add --enable-ubus option.

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index c70b90e..bad1443 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -225,6 +225,11 @@
     die(_("loop detection not available: set HAVE_LOOP in src/config.h"), NULL, EC_BADCONF);
 #endif
 
+#ifndef HAVE_UBUS
+  if (option_bool(OPT_UBUS))
+    die(_("Ubus not available: set HAVE_UBUS in src/config.h"), NULL, EC_BADCONF);
+#endif
+  
   if (daemon->max_port < daemon->min_port)
     die(_("max_port cannot be smaller than min_port"), NULL, EC_BADCONF);
 
@@ -950,9 +955,10 @@
 #endif
 
 #ifdef HAVE_UBUS
-      set_ubus_listeners();
+      if (option_bool(OPT_UBUS)
+	  set_ubus_listeners();
 #endif
-
+	  
 #ifdef HAVE_DHCP
       if (daemon->dhcp || daemon->relay4)
 	{
@@ -1084,7 +1090,8 @@
 #endif
 
 #ifdef HAVE_UBUS
-      check_ubus_listeners();
+      if (daemon->enable_ubus)
+        check_ubus_listeners();
 #endif
 
       check_dns_listeners(now);