Commit 63ec5d12 authored by Simon Kelley's avatar Simon Kelley

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

parent f6381cf4
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 version 2.74
Fix reversion in 2.73 where --conf-file would attempt to Fix reversion in 2.73 where --conf-file would attempt to
read the default file, rather than no file. read the default file, rather than no file.
......
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 dnsmasq (2.74-1) unstable; urgency=low
* New upstream. (LP: #1468611) * New upstream. (LP: #1468611)
......
...@@ -1025,7 +1025,7 @@ int main (int argc, char **argv) ...@@ -1025,7 +1025,7 @@ int main (int argc, char **argv)
#endif #endif
# ifdef HAVE_SCRIPT # ifdef HAVE_SCRIPT
if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLIN)) if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLOUT))
helper_write(); helper_write();
# endif # endif
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment