From 6425dfa9cb4acd69245665a75939c9e1bfe65f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 1 Dec 2020 18:53:26 +0100
Subject: [PATCH 1/2] Change the default value for nocookie-udp-size back to
 4096

The DNS Flag Day 2020 reduced all the EDNS buffer sizes to 1232.  In
this commit, we revert the default value for nocookie-udp-size back to
4096 because the option is too obscure and most people don't realize
that they also need to change this configuration option in addition to
max-udp-size.

(cherry picked from commit 79c196fc778a0e68eebcceaf04d03bf772ea70a3)
---
 bin/named/config.c      | 2 +-
 doc/arm/Bv9ARM-book.xml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/named/config.c b/bin/named/config.c
index 18710ab538..fbd2f2126c 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -90,7 +90,7 @@ options {\n\
 	memstatistics-file \"named.memstats\";\n\
 #	multiple-cnames <obsolete>;\n\
 #	named-xfer <obsolete>;\n\
-	nocookie-udp-size 1232;\n\
+	nocookie-udp-size 4096;\n\
 	notify-rate 20;\n\
 	nta-lifetime 3600;\n\
 	nta-recheck 300;\n\
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 466a529506..5790fb6847 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6211,8 +6211,9 @@ options {
 		  This sets the maximum size of UDP responses that are
 		  sent to queries without a valid server COOKIE. A value
 		  below 128 is silently raised to 128. The default
-		  value is 1232, but the <command>max-udp-size</command>
-		  option may further limit the response size.
+		  value is 4096, but the <command>max-udp-size</command>
+		  option may further limit the response size as the default
+		  for <command>max-udp-size</command> is 1232.
 		</para>
 	      </listitem>
 	    </varlistentry>

From 8aa8e521a96e460d954418961b0baace141fb4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 1 Dec 2020 19:01:30 +0100
Subject: [PATCH 2/2] Add CHANGES and release not for GL #2250

(cherry picked from commit c7d81f12f820beecebaeab184afc8df57e4f9a76)
---
 CHANGES                   |  3 +++
 doc/arm/notes-9.11.26.xml | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/CHANGES b/CHANGES
index d281aaa4e2..e3da7e2ef5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5544.	[func]		Restore the default value of nocookie-udp-size to 4096.
+			[GL #2250]
+
 5541.	[func]		Adjust the "max-recursion-queries" default from 75 to
 			100. [GL #2305]
 
diff --git a/doc/arm/notes-9.11.26.xml b/doc/arm/notes-9.11.26.xml
index 1499fc2a17..535dcb7006 100644
--- a/doc/arm/notes-9.11.26.xml
+++ b/doc/arm/notes-9.11.26.xml
@@ -65,6 +65,18 @@
           #2305]
         </para>
       </listitem>
+      <listitem>
+	<para>
+	  Restore the <command>nocookie-udp-size</command> default from 1232 to
+	  4096. Normally the EDNS buffer size is configured by
+	  <command>max-udp-size</command>, but this configuration option
+	  overrides the value, but most people don't and won't realize there's
+	  an extra configuration option that needs to be tweaked. By changing
+	  the default here, we allow the the <command>max-udp-size</command> to
+	  be the sole option that needs to be changed when operator wants to
+	  change the default EDNS buffer size. [GL #2250]
+	</para>
+      </listitem>
     </itemizedlist>
   </section>