Respect the --no-resolv flag in inotify code.

diff --git a/CHANGELOG b/CHANGELOG
index bbc2834897316c3a2bf88a3d75f2e43f82cd24aa..d6e309fa05331e8b9412e374d0c645506744d05b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,8 +7,13 @@ version 2.76
 
            Enhance --add-subnet to allow arbitrary subnet addresses.
             Thanks to Ed Barsley for the patch.
+
+           Respect the --no-resolv flag in inotify code. Fixes bug
+           which caused dnsmasq to fail to start if a resolv-file 
+           was a dangling symbolic link, even of --no-resolv set.
+           Thanks to Alexander Kurtz for spotting the problem.
+
        
-           
 version 2.75
             Fix reversion on 2.74 which caused 100% CPU use when a 
            dhcp-script is configured. Thanks to Adrian Davey for

diff --git a/debian/changelog b/debian/changelog
index 90da2d613371ac7fecd583d7ba8161a761aeb0ac..99c038331f9bc2869e0474f450dd9fe27b6a1fd7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dnsmasq (2.76-1) unstable; urgency=low
+
+   * New upstream. (closes: #798586)
+       
+ -- Simon Kelley <simon@thekelleys.org.uk>  Thur, 10 Sep 2015 23:07:21 +0000
+
 dnsmasq (2.75-1) unstable; urgency=low
 
    * New upstream. (closes: #794095)

diff --git a/src/inotify.c b/src/inotify.c
index 52d412f9e852d6455bf1aba40724b23a9adc6b5d..ef05c589cd14712007b429f87507d67f58e773a7 100644 (file)
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -90,6 +90,9 @@ void inotify_dnsmasq_init()
   
   if (daemon->inotifyfd == -1)
     die(_("failed to create inotify: %s"), NULL, EC_MISC);
+
+  if (option_bool(OPT_NO_RESOLV))
+    return;
   
   for (res = daemon->resolv_files; res; res = res->next)
     {