From: Simon Kelley <simon@thekelleys.org.uk>
Date: Thu, 30 Jul 2015 19:59:07 +0000 (+0100)
Subject: Fix new poll() code for helper pipe. Removed CPU-spin.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=HEAD;p=people%2Fms%2Fdnsmasq.git

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

diff --git a/CHANGELOG b/CHANGELOG
index 7c621e2..901da47 100644
--- 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.
diff --git a/debian/changelog b/debian/changelog
index 1355d46..90da2d6 100644
--- 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)
diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 04d5758..81254f6 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -1025,7 +1025,7 @@ int main (int argc, char **argv)
 #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