Skip to content

D
Dnsmasq
Commit 0669ee7a authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Fix DHCP broken-ness when --no-ping AND --dhcp-sequential-ip are set.

parent f84e674d
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
CHANGELOG
View file @ 0669ee7a
...@@ -14,7 +14,8 @@ version 2.80 ...@@ -14,7 +14,8 @@ version 2.80
when the upstream namesevers do not support DNSSEC, and in this when the upstream namesevers do not support DNSSEC, and in this
case no DNSSEC validation at all is occuring. case no DNSSEC validation at all is occuring.
Fix DHCP broken-ness when --no-ping AND --dhcp-sequential-ip
are set. Thanks to Daniel Miess for help with this.
version 2.79 version 2.79
......
src/dhcp.c
View file @ 0669ee7a
...@@ -678,7 +678,7 @@ struct ping_result *do_icmp_ping(time_t now, struct in_addr addr, unsigned int h ...@@ -678,7 +678,7 @@ struct ping_result *do_icmp_ping(time_t now, struct in_addr addr, unsigned int h
if ((count >= max) || option_bool(OPT_NO_PING) || loopback) if ((count >= max) || option_bool(OPT_NO_PING) || loopback)
{ {
/* overloaded, or configured not to check, loopback interface, return "not in use" */ /* overloaded, or configured not to check, loopback interface, return "not in use" */
dummy.hash = 0; dummy.hash = hash;
return &dummy; return &dummy;
} }
else if (icmp_ping(addr)) else if (icmp_ping(addr))
......
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