commit 60b68069cf8bde6f2201ece5735e1c8cf68378f3
author Simon Kelley <simon@thekelleys.org.uk> Wed Jan 08 12:10:28 2014 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Wed Jan 08 12:10:28 2014 +0000
tree bac6ef5897fb833b59444940e98548e998ac9ea8
parent 871417d45d4a4e061d9755720e5f0a0b9e3ff725

Rationalise DNS packet-buffer size calculations.

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 3e5f51e..27928fe 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -90,7 +90,12 @@
 #endif
 
   if (daemon->edns_pktsz < PACKETSZ)
-    daemon->edns_pktsz = option_bool(OPT_DNSSEC_VALID) ? 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;
   daemon->packet = safe_malloc(daemon->packet_buff_sz);