Fix new poll() code for helper pipe. Removed CPU-spin.

diff --git a/CHANGELOG b/CHANGELOG
index 7c621e283bd0ab3124515eb2559c4a59139143e8..901da4713ec93cc44a3cb214a64fad4153f0a73d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+version 2.75
+            Fix reversion on 2.74 which caused 100% CPU use when a 
+           dhcp-script is configured. Thanks to Adrian Davey for
+           reporting the bug and testing the fix.
+
+       

 version 2.74
             Fix reversion in 2.73 where --conf-file would attempt to
            read the default file, rather than no file.
 version 2.74
             Fix reversion in 2.73 where --conf-file would attempt to
            read the default file, rather than no file.

diff --git a/debian/changelog b/debian/changelog
index 1355d46da4e1e348c6eb5e1f1ad5ff9dc097e313..90da2d613371ac7fecd583d7ba8161a761aeb0ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dnsmasq (2.75-1) unstable; urgency=low
+
+   * New upstream. (closes: #794095)
+       
+ -- Simon Kelley <simon@thekelleys.org.uk>  Thur, 30 Jul 2015 20:58:31 +0000
+

 dnsmasq (2.74-1) unstable; urgency=low
 
    * New upstream. (LP: #1468611)
 dnsmasq (2.74-1) unstable; urgency=low
 
    * New upstream. (LP: #1468611)

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 04d57580f24bfc7af41c15e4a70ec4ac614cebd7..81254f67f4d0e79b2ce4427ffe94064867655fbf 100644 (file)
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -1025,7 +1025,7 @@ int main (int argc, char **argv)
 #endif
 
 #  ifdef HAVE_SCRIPT
 #endif
 
 #  ifdef HAVE_SCRIPT

-      if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLIN))
+      if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLOUT))

        helper_write();
 #  endif
 #endif
        helper_write();
 #  endif
 #endif