Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Kelley
2015-09-10 23:08:43 +01:00
parent 102208df69
commit 77607cbea0
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -8,6 +8,11 @@ version 2.76
Enhance --add-subnet to allow arbitrary subnet addresses. Enhance --add-subnet to allow arbitrary subnet addresses.
Thanks to Ed Barsley for the patch. 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 version 2.75
Fix reversion on 2.74 which caused 100% CPU use when a Fix reversion on 2.74 which caused 100% CPU use when a

6
debian/changelog vendored
View File

@@ -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 dnsmasq (2.75-1) unstable; urgency=low
* New upstream. (closes: #794095) * New upstream. (closes: #794095)

3
src/inotify.c
View File

@@ -91,6 +91,9 @@ void inotify_dnsmasq_init()
if (daemon->inotifyfd == -1) if (daemon->inotifyfd == -1)
die(_("failed to create inotify: %s"), NULL, EC_MISC); 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) for (res = daemon->resolv_files; res; res = res->next)
{ {
char *d, *new_path, *path = safe_malloc(strlen(res->name) + 1); char *d, *new_path, *path = safe_malloc(strlen(res->name) + 1);