CHANGES and release note for [GL #4046]

diff --git a/CHANGES b/CHANGES
index 645a2c96847497a5b85cbf6fa1b63fd3a80b8354..eac5a1a7c88933599f85247494d4d6231eeef0a6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6164.  [bug]           Set the rndc idle read timeout back to 60 seconds,
+                       from the netmgr default of 30 seconds, in order to
+                       match the behavior of 9.16 and earlier. [GL #4046]
+
 6163.  [func]          Add option to dnstap-read to use timestamps in
                        milliseconds (thanks to Oliver Ford). [GL #2360]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index fd3c957985adc7038ed3c5fdf1af1f9da094b53d..e06d042a4ca3d159a5e5b3c5758fab493e83b878 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -56,6 +56,10 @@ Bug Fixes
   logging :any:`channel` configured an absolute path as ``file`` destination.
   This has now been fixed. :gl:`#3991`.
 
+- The read timeout in ``rndc`` is now 60 seconds, matching the behavior
+  in BIND 9.16 and earlier. It had previously been lowered to 30 seconds
+  by mistake. :gl:`#4046`
+
 Known Issues
 ~~~~~~~~~~~~