From b2f96a94e3535a7fccbfd6b7dd18370718d5804b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 14 Dec 2016 12:51:46 +0000
Subject: [PATCH] unbound: EDNS buffer size defaults to 4096

If this is changed, a warning will be shown.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/initscripts/init.d/unbound | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound
index 08f98059ee..880278150a 100644
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/init.d/unbound
@@ -18,6 +18,9 @@ USE_FORWARDERS=1
 # Cache any local zones for 60 seconds
 LOCAL_TTL=60
 
+# EDNS buffer size
+EDNS_DEFAULT_BUFFER_SIZE=4096
+
 # Load optional configuration
 [ -e "/etc/sysconfig/unbound" ] && . /etc/sysconfig/unbound
 
@@ -87,19 +90,20 @@ update_forwarders() {
 		done
 
 		# Determine EDNS buffer size
-		local current_edns_buffer_size=$(unbound-control get_option edns-buffer-size)
-
-		if [ -n "${current_edns_buffer_size}" ]; then
-			local new_edns_buffer_size=${current_edns_buffer_size}
+		local new_edns_buffer_size=${EDNS_DEFAULT_BUFFER_SIZE}
 
-			for ns in ${forwarders}; do
-				local edns_buffer_size=$(ns_determine_edns_buffer_size ${ns})
-				if [ -n "${edns_buffer_size}" ]; then
-					if [ ${edns_buffer_size} -lt ${current_edns_buffer_size} ]; then
-						new_edns_buffer_size=${edns_buffer_size}
-					fi
+		for ns in ${forwarders}; do
+			local edns_buffer_size=$(ns_determine_edns_buffer_size ${ns})
+			if [ -n "${edns_buffer_size}" ]; then
+				if [ ${edns_buffer_size} -lt ${new_edns_buffer_size} ]; then
+					new_edns_buffer_size=${edns_buffer_size}
 				fi
-			done
+			fi
+		done
+
+		if [ ${new_edns_buffer_size} -lt ${EDNS_DEFAULT_BUFFER_SIZE} ]; then
+			boot_mesg "EDNS buffer size reduced to ${new_edns_buffer_size}" ${WARNING}
+			echo_warning
 
 			unbound-control -q set_option edns-buffer-size: ${new_edns_buffer_size}
 		fi
-- 
2.39.5