Merge branch '4046-rndc-timeout' into 'main'

set the default rndc read timeout to 60 seconds

See merge request isc-projects/bind9!7885

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]
 

bin/rndc/rndc.c

@@ -50,7 +50,8 @@
 
 #include "util.h"
 
-#define SERVERADDRS 10
+#define SERVERADDRS  10
+#define RNDC_TIMEOUT 60 * 1000
 
 const char *progname = NULL;
 bool verbose;
@@ -526,7 +527,7 @@ rndc_startconnect(isc_sockaddr_t *addr) {
 	}
 
 	isc_nm_tcpconnect(netmgr, local, addr, rndc_connected, &rndc_ccmsg,
-			  60000);
+			  RNDC_TIMEOUT);
 }
 
 static void
@@ -955,6 +956,8 @@ main(int argc, char **argv) {
 	isc_managers_create(&rndc_mctx, 1, &loopmgr, &netmgr);
 	isc_loopmgr_setup(loopmgr, rndc_start, NULL);
 
+	isc_nm_settimeouts(netmgr, RNDC_TIMEOUT, RNDC_TIMEOUT, RNDC_TIMEOUT, 0);
+
 	isc_log_create(rndc_mctx, &log, &logconfig);
 	isc_log_setcontext(log);
 	isc_log_settag(logconfig, progname);

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
 ~~~~~~~~~~~~