fbf475403b
Refresh patches and backport upstream to current HEAD: a997ca0 Fix sometimes missing DNSSEC RRs when DNSSEC validation not enabled. 51e4eee Fix address-dependent domains for IPv6. 05ff659 Fix stupid infinite loop introduced by preceding commit. db0f488 Handle some corner cases in RA contructed interfaces with addresses changing interface. 7dcca6c Warn about the impact of cache-size on performance. 090856c Allow zone transfer in authoritative mode whenever auth-peer is specified. cc5cc8f Sane error message when pcap file header is wrong. c488b68 Handle standard and contructed dhcp-ranges on the same interface. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 0669ee7a69a004ce34fed41e50aa575f8e04427b Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Fri, 4 May 2018 16:46:24 +0100
|
|
Subject: [PATCH 02/17] Fix DHCP broken-ness when --no-ping AND
|
|
--dhcp-sequential-ip are set.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
CHANGELOG | 3 ++-
|
|
src/dhcp.c | 2 +-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -14,7 +14,8 @@ version 2.80
|
|
when the upstream namesevers do not support DNSSEC, and in this
|
|
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
|
|
--- a/src/dhcp.c
|
|
+++ b/src/dhcp.c
|
|
@@ -678,7 +678,7 @@ struct ping_result *do_icmp_ping(time_t
|
|
if ((count >= max) || option_bool(OPT_NO_PING) || loopback)
|
|
{
|
|
/* overloaded, or configured not to check, loopback interface, return "not in use" */
|
|
- dummy.hash = 0;
|
|
+ dummy.hash = hash;
|
|
return &dummy;
|
|
}
|
|
else if (icmp_ping(addr))
|