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

Fix crash in PXE/netboot when DNS server disabled.

Browse Source
This commit is contained in:
Simon Kelley
2021-10-19 15:33:41 +01:00
parent 37a70d39e0
commit 9560658c5b
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -11,7 +11,11 @@ version 2.87
Add --filter-A and --filter-AAAA options, to remove IPv4 or IPv6 Add --filter-A and --filter-AAAA options, to remove IPv4 or IPv6
addresses from DNS answers. addresses from DNS answers.
Fix crash doing netbooting when --port is set to zero
to disable the DNS server. Thanks to Drexl Johannes
for the bug report.
version 2.86 version 2.86
Handle DHCPREBIND requests in the DHCPv6 server code. Handle DHCPREBIND requests in the DHCPv6 server code.
Thanks to Aichun Li for spotting this omission, and the initial Thanks to Aichun Li for spotting this omission, and the initial

3
debian/changelog vendored
View File

@@ -1,7 +1,8 @@
dnsmasq (2.87-1) unstable; urgency=low dnsmasq (2.87-1) unstable; urgency=low
* New upstream. * New upstream.
* Include new NFTset support in the build. * Include new NFTset support in the build.
* Fix crash on netboot with DNS server disabled. (closes: #996332)
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 08 Sep 2021 23:11:25 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Wed, 08 Sep 2021 23:11:25 +0000

10
src/cache.c
View File

@@ -1399,10 +1399,12 @@ struct in_addr a_record_from_hosts(char *name, time_t now)
struct crec *crecp = NULL; struct crec *crecp = NULL;
struct in_addr ret; struct in_addr ret;
while ((crecp = cache_find_by_name(crecp, name, now, F_IPV4))) /* If no DNS service, cache not initialised. */
if (crecp->flags & F_HOSTS) if (daemon->port != 0)
return crecp->addr.addr4; while ((crecp = cache_find_by_name(crecp, name, now, F_IPV4)))
if (crecp->flags & F_HOSTS)
return crecp->addr.addr4;
my_syslog(MS_DHCP | LOG_WARNING, _("No IPv4 address found for %s"), name); my_syslog(MS_DHCP | LOG_WARNING, _("No IPv4 address found for %s"), name);
ret.s_addr = 0; ret.s_addr = 0;