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

This commit is contained in:
Simon Kelley
2018-05-04 16:46:24 +01:00
parent f84e674d8a
commit 0669ee7a69
2 changed files with 3 additions and 2 deletions

View File

@@ -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

View File

@@ -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))