From d69cd51f919c1d2e6f78f9869087437ba085bf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 24 Apr 2024 13:55:11 +0200 Subject: [PATCH 1/2] Properly document that named -U is no-op now We don't create UDP dispatches anymore and -U option to named is a no-op for a while. Properly document that in the named man page. --- bin/named/named.rst | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/bin/named/named.rst b/bin/named/named.rst index 967119ca08..ee893faba7 100644 --- a/bin/named/named.rst +++ b/bin/named/named.rst @@ -21,7 +21,7 @@ named - Internet domain name server Synopsis ~~~~~~~~ -:program:`named` [ [**-4**] | [**-6**] ] [**-c** config-file] [**-C**] [**-d** debug-level] [**-D** string] [**-E** engine-name] [**-f**] [**-g**] [**-L** logfile] [**-M** option] [**-m** flag] [**-n** #cpus] [**-p** port] [**-s**] [**-t** directory] [**-U** #listeners] [**-u** user] [**-v**] [**-V**] ] +:program:`named` [ [**-4**] | [**-6**] ] [**-c** config-file] [**-C**] [**-d** debug-level] [**-D** string] [**-E** engine-name] [**-f**] [**-g**] [**-L** logfile] [**-M** option] [**-m** flag] [**-n** #cpus] [**-p** port] [**-s**] [**-t** directory] [**-u** user] [**-v**] [**-V**] ] Description ~~~~~~~~~~~ @@ -163,14 +163,7 @@ Options .. option:: -U #listeners - This option tells :program:`named` the number of ``#listeners`` worker threads to listen on, for incoming UDP packets on - each address. If not specified, :program:`named` calculates a default - value based on the number of detected CPUs: 1 for 1 CPU, and the - number of detected CPUs minus one for machines with more than 1 CPU. - This cannot be increased to a value higher than the number of CPUs. - If :option:`-n` has been set to a higher value than the number of detected - CPUs, then :option:`-U` may be increased as high as that value, but no - higher. + This option has been removed. Attempts to use it now result in a warning. .. option:: -u user From 9305ebdabee5c66c810b41cfe3028a2973676399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 24 Apr 2024 14:03:50 +0200 Subject: [PATCH 2/2] Add CHANGES and release note for [GL #1879] --- CHANGES | 5 +++++ bin/named/main.c | 1 + doc/notes/notes-current.rst | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 98cc7731ac..11f12cf858 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +6378. [func] The option to specify the number of UDP dispatches was + previously removed. An attempt to use the option now prints + a warning. + [GL #1879] + 6377. [func] Introduce 'dnssec-ksr', a DNSSEC tool to create Key Signing Requests (KSRs) and Signed Key Responses (SKRs). [GL #1128] diff --git a/bin/named/main.c b/bin/named/main.c index b828b3a2ae..6cb3392005 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -949,6 +949,7 @@ parse_command_line(int argc, char *argv[]) { break; case 'U': /* Obsolete. No longer in use. Ignore. */ + named_main_earlywarning("option '-U' has been removed"); break; case 'u': named_g_username = isc_commandline_argument; diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index de2101c565..2f71c587d2 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -29,7 +29,8 @@ New Features Removed Features ~~~~~~~~~~~~~~~~ -- None. +- The ``named`` command line option ``-U ``, which specified the number of UDP dispatches, + has been removed. Using it now prints a warning. :gl:`#1879` Feature Changes ~~~~~~~~~~~~~~~