[#3431] release changes

isc-projects · May 24, 2024 · 37ff385 · 37ff385
1 parent e952797
commit 37ff385
Show file tree

Hide file tree

Showing 34 changed files with 54 additions and 117 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+Kea 2.6.0 (stable) released on May 29, 2024
+
 2247.	[build]		razvan
 	The library version numbers have been bumped up for the Kea 2.6.0
 	stable release.

diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.69])
 # For released versions, this is in x.y.z format.
 # For GIT versions, this is x.y.z-git, where x.y.z denotes the next development
 # version that is worked on and that is to be released.
-AC_INIT(kea, 2.5.9-git, [email protected])
+AC_INIT(kea, 2.6.0-git, [email protected])
 AC_CONFIG_SRCDIR(README)
 
 # serial-tests is not available in automake version before 1.13, so

diff --git a/doc/devel/unit-tests.dox b/doc/devel/unit-tests.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/doc/sphinx/grammar/grammar-dhcp4-parser.rst b/doc/sphinx/grammar/grammar-dhcp4-parser.rst
@@ -121,7 +121,6 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                  | reservations
                  | config_control
                  | server_tag
-                 | reservation_mode
                  | reservations_global
                  | reservations_in_subnet
                  | reservations_out_of_pool
@@ -510,7 +509,6 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                   | client_class
                   | require_client_classes
                   | reservations
-                  | reservation_mode
                   | reservations_global
                   | reservations_in_subnet
                   | reservations_out_of_pool
@@ -567,13 +565,6 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
 
      reservations_out_of_pool ::= "reservations-out-of-pool" ":" BOOLEAN
 
-     reservation_mode ::= "reservation-mode" ":" hr_mode
-
-     hr_mode ::= "disabled"
-            | "out-of-pool"
-            | "global"
-            | "all"
-
      id ::= "id" ":" INTEGER
 
      shared_networks ::= "shared-networks" ":" "[" shared_networks_content "]"
@@ -603,7 +594,6 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                          | server_hostname
                          | boot_file_name
                          | relay
-                         | reservation_mode
                          | reservations_global
                          | reservations_in_subnet
                          | reservations_out_of_pool
@@ -810,8 +800,6 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
 
      ip_address ::= "ip-address" ":" STRING
 
-     ip_addresses ::= "ip-addresses" ":" list_strings
-
      duid ::= "duid" ":" STRING
 
      hw_address ::= "hw-address" ":" STRING
@@ -828,8 +816,9 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
 
      relay ::= "relay" ":" "{" relay_map "}"
 
-     relay_map ::= ip_address
-              | ip_addresses
+     relay_map ::= ip_addresses
+
+     ip_addresses ::= "ip-addresses" ":" list_strings
 
      client_classes ::= "client-classes" ":" "[" client_classes_list "]"
 
@@ -926,13 +915,6 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                     | max_queue_size
                     | ncr_protocol
                     | ncr_format
-                    | dep_override_no_update
-                    | dep_override_client_update
-                    | dep_replace_client_name
-                    | dep_generated_prefix
-                    | dep_qualifying_suffix
-                    | dep_hostname_char_set
-                    | dep_hostname_char_replacement
                     | user_context
                     | comment
                     | unknown_map_entry
@@ -956,20 +938,6 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
 
      ncr_format ::= "ncr-format" ":" "JSON"
 
-     dep_qualifying_suffix ::= "qualifying-suffix" ":" STRING
-
-     dep_override_no_update ::= "override-no-update" ":" BOOLEAN
-
-     dep_override_client_update ::= "override-client-update" ":" BOOLEAN
-
-     dep_replace_client_name ::= "replace-client-name" ":" ddns_replace_client_name_value
-
-     dep_generated_prefix ::= "generated-prefix" ":" STRING
-
-     dep_hostname_char_set ::= "hostname-char-set" ":" STRING
-
-     dep_hostname_char_replacement ::= "hostname-char-replacement" ":" STRING
-
      config_control ::= "config-control" ":" "{" config_control_params "}"
 
      sub_config_control ::= "{" config_control_params "}"

diff --git a/doc/sphinx/grammar/grammar-dhcp6-parser.rst b/doc/sphinx/grammar/grammar-dhcp6-parser.rst
@@ -124,7 +124,6 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                  | reservations
                  | config_control
                  | server_tag
-                 | reservation_mode
                  | reservations_global
                  | reservations_in_subnet
                  | reservations_out_of_pool
@@ -513,7 +512,6 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                   | client_class
                   | require_client_classes
                   | reservations
-                  | reservation_mode
                   | reservations_global
                   | reservations_in_subnet
                   | reservations_out_of_pool
@@ -558,13 +556,6 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
 
      reservations_out_of_pool ::= "reservations-out-of-pool" ":" BOOLEAN
 
-     reservation_mode ::= "reservation-mode" ":" hr_mode
-
-     hr_mode ::= "disabled"
-            | "out-of-pool"
-            | "global"
-            | "all"
-
      id ::= "id" ":" INTEGER
 
      rapid_commit ::= "rapid-commit" ":" BOOLEAN
@@ -592,7 +583,6 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                          | rebind_timer
                          | option_data_list
                          | relay
-                         | reservation_mode
                          | reservations_global
                          | reservations_in_subnet
                          | reservations_out_of_pool
@@ -779,6 +769,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
      pd_pool_param ::= pd_prefix
                   | pd_prefix_len
                   | pd_delegated_len
+                  | pool_id
                   | option_data_list
                   | client_class
                   | require_client_classes
@@ -846,10 +837,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
 
      relay ::= "relay" ":" "{" relay_map "}"
 
-     relay_map ::= ip_address
-              | ip_addresses
-
-     ip_address ::= "ip-address" ":" STRING
+     relay_map ::= ip_addresses
 
      client_classes ::= "client-classes" ":" "[" client_classes_list "]"
 
@@ -974,21 +962,12 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                     | max_queue_size
                     | ncr_protocol
                     | ncr_format
-                    | dep_override_no_update
-                    | dep_override_client_update
-                    | dep_replace_client_name
-                    | dep_generated_prefix
-                    | dep_qualifying_suffix
-                    | dep_hostname_char_set
-                    | dep_hostname_char_replacement
                     | user_context
                     | comment
                     | unknown_map_entry
 
      enable_updates ::= "enable-updates" ":" BOOLEAN
 
-     dep_qualifying_suffix ::= "qualifying-suffix" ":" STRING
-
      server_ip ::= "server-ip" ":" STRING
 
      server_port ::= "server-port" ":" INTEGER
@@ -1006,18 +985,6 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
 
      ncr_format ::= "ncr-format" ":" "JSON"
 
-     dep_override_no_update ::= "override-no-update" ":" BOOLEAN
-
-     dep_override_client_update ::= "override-client-update" ":" BOOLEAN
-
-     dep_replace_client_name ::= "replace-client-name" ":" ddns_replace_client_name_value
-
-     dep_generated_prefix ::= "generated-prefix" ":" STRING
-
-     dep_hostname_char_set ::= "hostname-char-set" ":" STRING
-
-     dep_hostname_char_replacement ::= "hostname-char-replacement" ":" STRING
-
      config_control ::= "config-control" ":" "{" config_control_params "}"
 
      sub_config_control ::= "{" config_control_params "}"

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -1,6 +1,6 @@
-#line 2 "dhcp4_lexer.cc"
+#line 1 "dhcp4_lexer.cc"
 
-#line 4 "dhcp4_lexer.cc"
+#line 3 "dhcp4_lexer.cc"
 
 #define  YY_INT_ALIGNED short int
 
@@ -2209,7 +2209,7 @@ using namespace isc::dhcp;
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg)
-#line 2213 "dhcp4_lexer.cc"
+#line 2212 "dhcp4_lexer.cc"
 /* noyywrap disables automatic rewinding for the next file to parse. Since we
    always parse only a single string, there's no need to do any wraps. And
    using yywrap requires linking with -lfl, which provides the default yywrap
@@ -2235,8 +2235,8 @@ using namespace isc::dhcp;
    by moving it ahead by yyleng bytes. yyleng specifies the length of the
    currently matched token. */
 #define YY_USER_ACTION  driver.loc_.columns(yyleng);
+#line 2238 "dhcp4_lexer.cc"
 #line 2239 "dhcp4_lexer.cc"
-#line 2240 "dhcp4_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -2564,7 +2564,7 @@ YY_DECL
     }
 
 
-#line 2568 "dhcp4_lexer.cc"
+#line 2567 "dhcp4_lexer.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -5563,7 +5563,7 @@ YY_RULE_SETUP
 #line 2379 "dhcp4_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 5567 "dhcp4_lexer.cc"
+#line 5566 "dhcp4_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{

diff --git a/src/bin/dhcp4/parser_context.cc b/src/bin/dhcp4/parser_context.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp4/parser_context.h b/src/bin/dhcp4/parser_context.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp4/tests/out_of_range_unittest.cc b/src/bin/dhcp4/tests/out_of_range_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc
@@ -1,6 +1,6 @@
-#line 2 "dhcp6_lexer.cc"
+#line 1 "dhcp6_lexer.cc"
 
-#line 4 "dhcp6_lexer.cc"
+#line 3 "dhcp6_lexer.cc"
 
 #define  YY_INT_ALIGNED short int
 
@@ -2180,7 +2180,7 @@ using namespace isc::dhcp;
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser6Context::fatal(msg)
-#line 2184 "dhcp6_lexer.cc"
+#line 2183 "dhcp6_lexer.cc"
 /* noyywrap disables automatic rewinding for the next file to parse. Since we
    always parse only a single string, there's no need to do any wraps. And
    using yywrap requires linking with -lfl, which provides the default yywrap
@@ -2206,8 +2206,8 @@ using namespace isc::dhcp;
    by moving it ahead by yyleng bytes. yyleng specifies the length of the
    currently matched token. */
 #define YY_USER_ACTION  driver.loc_.columns(yyleng);
+#line 2209 "dhcp6_lexer.cc"
 #line 2210 "dhcp6_lexer.cc"
-#line 2211 "dhcp6_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -2537,7 +2537,7 @@ YY_DECL
     }
 
 
-#line 2541 "dhcp6_lexer.cc"
+#line 2540 "dhcp6_lexer.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -5562,7 +5562,7 @@ YY_RULE_SETUP
 #line 2401 "dhcp6_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 5566 "dhcp6_lexer.cc"
+#line 5565 "dhcp6_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{

diff --git a/src/bin/dhcp6/parser_context.cc b/src/bin/dhcp6/parser_context.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp6/parser_context.h b/src/bin/dhcp6/parser_context.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp6/tests/sarr_unittest.cc b/src/bin/dhcp6/tests/sarr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/dhcp6/tests/simple_parser6_unittest.cc b/src/bin/dhcp6/tests/simple_parser6_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
 
 % LEASE_CMDS_ADD4 lease4-add command successful (address: %1)
 The lease4-add command has been successful. Lease IPv4 address
@@ -124,20 +124,20 @@ parameters passed are logged.
 The lease4-wipe command has been successful. Parameters of the command
 are logged.
 
+% LEASE_CMDS_WIPE4_DEPRECATED lease4-wipe command is deprecated and it will be removed in the future.
+The lease4-wipe command is deprecated and it will be removed in the future.
+
 % LEASE_CMDS_WIPE4_FAILED lease4-wipe command failed (parameters: %1, reason: %2)
 The lease4-wipe command has failed. Both the reason as well as the
 parameters passed are logged.
 
-% LEASE_CMDS_WIPE4_DEPRECATED lease4-wipe command is deprecated and it will be removed in the future.
-The lease4-wipe command is deprecated and it will be removed in the future.
-
 % LEASE_CMDS_WIPE6 lease6-wipe command successful (parameters: %1)
 The lease6-wipe command has been successful. Parameters of the command
 are logged.
 
+% LEASE_CMDS_WIPE6_DEPRECATED lease6-wipe command is deprecated and it will be removed in the future.
+The lease6-wipe command is deprecated and it will be removed in the future.
+
 % LEASE_CMDS_WIPE6_FAILED lease6-wipe command failed (parameters: %1, reason: %2)
 The lease6-wipe command has failed. Both the reason as well as the
 parameters passed are logged.
-
-% LEASE_CMDS_WIPE6_DEPRECATED lease6-wipe command is deprecated and it will be removed in the future.
-The lease6-wipe command is deprecated and it will be removed in the future.