mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 800c5cc1e7438818fd80f08c2d472df249a6942d Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Mon, 15 Dec 2014 17:50:15 +0000
|
|
Subject: [PATCH 11/98] Remove floor on EDNS0 packet size with DNSSEC.
|
|
|
|
---
|
|
CHANGELOG | 6 +++++-
|
|
src/dnsmasq.c | 5 -----
|
|
2 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
|
index 13ab41c05fc3..68252924e743 100644
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -2,7 +2,11 @@ version 2.73
|
|
Fix crash at startup when an empty suffix is supplied to
|
|
--conf-dir, also trivial memory leak. Thanks to
|
|
Tomas Hozza for spotting this.
|
|
-
|
|
+
|
|
+ Remove floor of 4096 on advertised EDNS0 packet size when
|
|
+ DNSSEC in use, the original rationale for this has long gone.
|
|
+ Thanks to Anders Kaseorg for spotting this.
|
|
+
|
|
|
|
version 2.72
|
|
Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
|
|
diff --git a/src/dnsmasq.c b/src/dnsmasq.c
|
|
index bf2e25a55780..5c7750d365fa 100644
|
|
--- a/src/dnsmasq.c
|
|
+++ b/src/dnsmasq.c
|
|
@@ -87,11 +87,6 @@ int main (int argc, char **argv)
|
|
|
|
if (daemon->edns_pktsz < PACKETSZ)
|
|
daemon->edns_pktsz = PACKETSZ;
|
|
-#ifdef HAVE_DNSSEC
|
|
- /* Enforce min packet big enough for DNSSEC */
|
|
- if (option_bool(OPT_DNSSEC_VALID) && daemon->edns_pktsz < EDNS_PKTSZ)
|
|
- daemon->edns_pktsz = EDNS_PKTSZ;
|
|
-#endif
|
|
|
|
daemon->packet_buff_sz = daemon->edns_pktsz > DNSMASQ_PACKETSZ ?
|
|
daemon->edns_pktsz : DNSMASQ_PACKETSZ;
|
|
--
|
|
2.1.0
|
|
|