[#2610] release changes

2025-08-31 14:05:33 +00:00 · 2022-10-25 02:27:05 -07:00
parent e52df9044a
commit acb0792255
28 changed files with 103 additions and 91 deletions
--- a/2
+++ b/2
@@ -1,3 +1,5 @@
+Kea 2.3.2 (development) released on October 26, 2022
+
 2073.	[build]		razvan
 	The library version numbers have been bumped for the Kea 2.3.2
 	development release.
--- a/doc/sphinx/grammar/grammar-dhcp4-parser.rst
+++ b/doc/sphinx/grammar/grammar-dhcp4-parser.rst
@@ -270,9 +270,12 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                         | sanity_checks_params ","

     sanity_checks_param ::= lease_checks
+                        | extended_info_checks

     lease_checks ::= "lease-checks" ":" STRING

+     extended_info_checks ::= "extended-info-checks" ":" STRING
+
     hosts_database ::= "hosts-database" ":" "{" database_map_params "}"

     hosts_databases ::= "hosts-databases" ":" "[" database_list "]"
@@ -799,6 +802,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de

     client_class_param ::= client_class_name
                       | client_class_test
+                       | client_class_template_test
                       | only_if_required
                       | option_def_list
                       | option_data_list
@@ -816,6 +820,8 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de

     client_class_test ::= "test" ":" STRING

+     client_class_template_test ::= "template-test" ":" STRING
+
     only_if_required ::= "only-if-required" ":" BOOLEAN

     dhcp4o6_port ::= "dhcp4o6-port" ":" INTEGER
@@ -990,7 +996,8 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                         | compatibility_params "," compatibility_param
                         | compatibility_params ","

-     compatibility_param ::= lenient_option_parsing | ignore-rai-link-selection |
+     compatibility_param ::= lenient_option_parsing
+                        | ignore-rai-link-selection
                        | unknown_map_entry

     lenient_option_parsing ::= "lenient-option-parsing" ":" BOOLEAN
--- a/doc/sphinx/grammar/grammar-dhcp6-parser.rst
+++ b/doc/sphinx/grammar/grammar-dhcp6-parser.rst
@@ -344,9 +344,12 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                         | sanity_checks_params ","

     sanity_checks_param ::= lease_checks
+                        | extended_info_checks

     lease_checks ::= "lease-checks" ":" STRING

+     extended_info_checks ::= "extended-info-checks" ":" STRING
+
     mac_sources ::= "mac-sources" ":" "[" mac_sources_list "]"

     mac_sources_list ::= mac_sources_value
@@ -822,6 +825,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de

     client_class_param ::= client_class_name
                       | client_class_test
+                       | client_class_template_test
                       | only_if_required
                       | option_data_list
                       | user_context
@@ -838,6 +842,8 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de

     client_class_test ::= "test" ":" STRING

+     client_class_template_test ::= "template-test" ":" STRING
+
     only_if_required ::= "only-if-required" ":" BOOLEAN

     server_id ::= "server-id" ":" "{" server_id_params "}"
--- a/src/bin/d2/parser_context.cc
+++ b/src/bin/d2/parser_context.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2022 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
--- 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

@@ -2116,7 +2116,7 @@ using namespace isc::dhcp;

 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg)
-#line 2120 "dhcp4_lexer.cc"
+#line 2119 "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
@@ -2142,8 +2142,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 2145 "dhcp4_lexer.cc"
 #line 2146 "dhcp4_lexer.cc"
-#line 2147 "dhcp4_lexer.cc"

 #define INITIAL 0
 #define COMMENT 1
@@ -2471,7 +2471,7 @@ YY_DECL
    }


-#line 2475 "dhcp4_lexer.cc"
+#line 2474 "dhcp4_lexer.cc"

 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -5374,7 +5374,7 @@ YY_RULE_SETUP
 #line 2303 "dhcp4_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 5378 "dhcp4_lexer.cc"
+#line 5377 "dhcp4_lexer.cc"

 	case YY_END_OF_BUFFER:
 		{
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -283,6 +283,22 @@ This warning message is displayed when the version is a development
 % DHCP4_DHCP4O6_BAD_PACKET received malformed DHCPv4o6 packet: %1
 A malformed DHCPv4o6 packet was received.

+% DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP %1: packet was dropped, because a callout set the next step to 'drop'
+This debug message is printed when a callout installed on the
+subnet4_select hook point sets the next step to 'drop' value. For this particular hook
+point, the setting to that value instructs the server to drop the received
+packet. The argument specifies the client and transaction identification
+information.
+
+% DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_SKIP %1: no subnet was selected, because a callout set the next skip flag
+This debug message is printed when a callout installed on the
+subnet4_select hook point sets the next step to SKIP value. For this particular hook
+point, the setting of the flag instructs the server not to choose a
+subnet, an action that severely limits further processing; the server
+will be only able to offer global options - no addresses will be assigned.
+The argument specifies the client and transaction identification
+information.
+
 % DHCP4_DHCP4O6_PACKET_RECEIVED received DHCPv4o6 packet from DHCPv4 server (type %1) for %2 on interface %3
 This debug message is printed when the server is receiving a DHCPv4o6
 from the DHCPv4 server over inter-process communication.
@@ -315,6 +331,28 @@ information. The second and third argument contains the packet name
 and type respectively. The fourth argument contains detailed packet
 information.

+% DHCP4_DHCP4O6_SUBNET_DATA %1: the selected subnet details: %2
+This debug message includes the details of the subnet selected for
+the client. The first argument includes the client and the
+transaction identification information. The second arguments
+includes the subnet details.
+
+% DHCP4_DHCP4O6_SUBNET_SELECTED %1: the subnet with ID %2 was selected for client assignments
+This is a debug message noting the selection of a subnet to be used for
+address and option assignment. Subnet selection is one of the early
+steps in the processing of incoming client message. The first
+argument includes the client and the transaction identification
+information. The second argument holds the selected subnet id.
+
+% DHCP4_DHCP4O6_SUBNET_SELECTION_FAILED %1: failed to select subnet for the client
+This debug message indicates that the server failed to select the
+subnet for the client which has sent a message to the server.
+The server will not be able to offer any lease to the client and
+will drop its message if the received message was DHCPDISCOVER,
+and will send DHCPNAK if the received message was DHCPREQUEST.
+The argument includes the client and the transaction identification
+information.
+
 % DHCP4_DYNAMIC_RECONFIGURATION initiate server reconfiguration using file: %1, after receiving SIGHUP signal or config-reload command
 This is the info message logged when the DHCPv4 server starts reconfiguration
 as a result of receiving SIGHUP signal or config-reload command.
@@ -445,22 +483,6 @@ will be only able to offer global options - no addresses will be assigned.
 The argument specifies the client and transaction identification
 information.

-% DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP %1: packet was dropped, because a callout set the next step to 'drop'
-This debug message is printed when a callout installed on the
-subnet4_select hook point sets the next step to 'drop' value. For this particular hook
-point, the setting to that value instructs the server to drop the received
-packet. The argument specifies the client and transaction identification
-information.
-
-% DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_SKIP %1: no subnet was selected, because a callout set the next skip flag
-This debug message is printed when a callout installed on the
-subnet4_select hook point sets the next step to SKIP value. For this particular hook
-point, the setting of the flag instructs the server not to choose a
-subnet, an action that severely limits further processing; the server
-will be only able to offer global options - no addresses will be assigned.
-The argument specifies the client and transaction identification
-information.
-
 % DHCP4_INFORM_DIRECT_REPLY %1: DHCPACK in reply to the DHCPINFORM will be sent directly to %2 over %3
 This debug message is issued when the DHCPACK will be sent directly to the
 client, rather than via a relay. The first argument contains the client
@@ -791,12 +813,6 @@ is a normal operation during client shutdown. The first argument includes
 the client and transaction identification information. The second argument
 includes the released IPv4 address.

-% DHCP4_RELEASE_EXPIRED %1: address %2 expired on release.
-This informational message indicates that an address expired on release. It is
-a normal operation during client shutdown. The first argument includes the
-client and transaction identification information. The second argument includes
-the released IPv4 address.
-
 % DHCP4_RELEASE_DELETED %1: address %2 was deleted on release.
 This informational message indicates that an address was deleted on release. It
 is a normal operation during client shutdown. The first argument includes the
@@ -813,6 +829,12 @@ transaction identification information. The second argument
 includes the IPv4 address which release was attempted. The last
 argument includes the detailed error description.

+% DHCP4_RELEASE_EXPIRED %1: address %2 expired on release.
+This informational message indicates that an address expired on release. It is
+a normal operation during client shutdown. The first argument includes the
+client and transaction identification information. The second argument includes
+the released IPv4 address.
+
 % DHCP4_RELEASE_FAIL %1: failed to remove lease for address %2
 This error message indicates that the software failed to remove a
 lease from the lease database. It is probably due to an error during a
@@ -938,12 +960,6 @@ the client. The first argument includes the client and the
 transaction identification information. The second arguments
 includes the subnet details.

-% DHCP4_DHCP4O6_SUBNET_DATA %1: the selected subnet details: %2
-This debug message includes the details of the subnet selected for
-the client. The first argument includes the client and the
-transaction identification information. The second arguments
-includes the subnet details.
-
 % DHCP4_SUBNET_DYNAMICALLY_CHANGED %1: changed selected subnet %2 to subnet %3 from shared network %4 for client assignments
 This debug message indicates that the server is using another subnet
 than initially selected for client assignments. This newly selected
@@ -968,22 +984,6 @@ and will send DHCPNAK if the received message was DHCPREQUEST.
 The argument includes the client and the transaction identification
 information.

-% DHCP4_DHCP4O6_SUBNET_SELECTED %1: the subnet with ID %2 was selected for client assignments
-This is a debug message noting the selection of a subnet to be used for
-address and option assignment. Subnet selection is one of the early
-steps in the processing of incoming client message. The first
-argument includes the client and the transaction identification
-information. The second argument holds the selected subnet id.
-
-% DHCP4_DHCP4O6_SUBNET_SELECTION_FAILED %1: failed to select subnet for the client
-This debug message indicates that the server failed to select the
-subnet for the client which has sent a message to the server.
-The server will not be able to offer any lease to the client and
-will drop its message if the received message was DHCPDISCOVER,
-and will send DHCPNAK if the received message was DHCPREQUEST.
-The argument includes the client and the transaction identification
-information.
-
 % DHCP4_TESTING_MODE_SEND_TO_SOURCE_ENABLED All packets will be send to source address of an incoming packet - use only for testing
 This message is printed then KEA_TEST_SEND_RESPONSES_TO_SOURCE
 environment variable is set. It's causing Kea to send packets to
--- a/src/bin/dhcp4/dhcp4to6_ipc.cc
+++ b/src/bin/dhcp4/dhcp4to6_ipc.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2022 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
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,5 +1,3 @@
-// Generated 202210152259
-// Generated 202210152258
 // A Bison parser, made by GNU Bison 3.8.2.

 // Locations for Bison parsers in C++
--- a/src/bin/dhcp4/tests/fqdn_unittest.cc
+++ b/src/bin/dhcp4/tests/fqdn_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2022 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
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2022 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
--- 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-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2022 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
--- a/src/bin/dhcp4/tests/release_unittest.cc
+++ b/src/bin/dhcp4/tests/release_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2022 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
--- a/src/bin/dhcp4/tests/simple_parser4_unittest.cc
+++ b/src/bin/dhcp4/tests/simple_parser4_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2022 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
--- 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

@@ -2122,7 +2122,7 @@ using namespace isc::dhcp;

 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser6Context::fatal(msg)
-#line 2126 "dhcp6_lexer.cc"
+#line 2125 "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
@@ -2148,8 +2148,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 2151 "dhcp6_lexer.cc"
 #line 2152 "dhcp6_lexer.cc"
-#line 2153 "dhcp6_lexer.cc"

 #define INITIAL 0
 #define COMMENT 1
@@ -2479,7 +2479,7 @@ YY_DECL
    }


-#line 2483 "dhcp6_lexer.cc"
+#line 2482 "dhcp6_lexer.cc"

 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -5455,7 +5455,7 @@ YY_RULE_SETUP
 #line 2358 "dhcp6_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 5459 "dhcp6_lexer.cc"
+#line 5458 "dhcp6_lexer.cc"

 	case YY_END_OF_BUFFER:
 		{
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -799,18 +799,18 @@ is a normal operation during client shutdown. The first argument includes
 the client and transaction identification information. The second and third
 argument hold the released IPv6 address and IAID respectively.

-% DHCP6_RELEASE_NA_EXPIRED %1: binding for address %2 and iaid=%3 expired on release
-This informational message indicates that an address expired on release. It is a
-normal operation during client shutdown. The first argument includes the client
-and transaction identification information. The second and third argument hold
-the released IPv6 address and IAID respectively.
-
 % DHCP6_RELEASE_NA_DELETED %1: binding for address %2 and iaid=%3 was deleted on release
 This informational message indicates that an address was deleted on release. It
 is a normal operation during client shutdown. The first argument includes the
 client and transaction identification information. The second and third argument
 hold the released IPv6 address and IAID respectively.

+% DHCP6_RELEASE_NA_EXPIRED %1: binding for address %2 and iaid=%3 expired on release
+This informational message indicates that an address expired on release. It is a
+normal operation during client shutdown. The first argument includes the client
+and transaction identification information. The second and third argument hold
+the released IPv6 address and IAID respectively.
+
 % DHCP6_RELEASE_NA_FAIL %1: failed to remove address lease for address %2 and iaid=%3
 This error message indicates that the software failed to remove an address
 lease from the lease database.  It probably due to an error during a
@@ -841,18 +841,18 @@ is a normal operation during client shutdown. The first argument holds
 the client and transaction identification information. The second and
 third argument hold the prefix and its length. The fourth argument holds IAID.

-% DHCP6_RELEASE_PD_EXPIRED %1: prefix %2/%3 for iaid=%4 expired on release
-This informational message indicates that a prefix expired on release. It is a
-normal operation during client shutdown. The first argument holds the client and
-transaction identification information. The second and third argument hold the
-prefix and its length. The fourth argument holds IAID.
-
 % DHCP6_RELEASE_PD_DELETED %1: prefix %2/%3 for iaid=%4 was deleted on release
 This informational message indicates that a prefix was deleted on release. It is
 a normal operation during client shutdown. The first argument holds the client
 and transaction identification information. The second and third argument hold
 the prefix and its length. The fourth argument holds IAID.

+% DHCP6_RELEASE_PD_EXPIRED %1: prefix %2/%3 for iaid=%4 expired on release
+This informational message indicates that a prefix expired on release. It is a
+normal operation during client shutdown. The first argument holds the client and
+transaction identification information. The second and third argument hold the
+prefix and its length. The fourth argument holds IAID.
+
 % DHCP6_RELEASE_PD_FAIL %1: failed to release prefix %2/%3 for iaid=%4
 This error message indicates that the software failed to remove a prefix
 lease from the lease database.  It probably due to an error during a
--- a/src/bin/dhcp6/dhcp6to4_ipc.cc
+++ b/src/bin/dhcp6/dhcp6to4_ipc.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2022 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
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,3 @@
-// Generated 202210152300
 // A Bison parser, made by GNU Bison 3.8.2.

 // Locations for Bison parsers in C++
--- 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-2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2022 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
--- a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
+++ b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2022 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
--- a/src/hooks/dhcp/user_chk/pkt_send_co.cc
+++ b/src/hooks/dhcp/user_chk/pkt_send_co.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2022 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
--- a/src/hooks/dhcp/user_chk/user_file.cc
+++ b/src/hooks/dhcp/user_chk/user_file.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2022 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
--- a/src/lib/asiolink/asio_wrapper.h
+++ b/src/lib/asiolink/asio_wrapper.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2022 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
--- a/src/lib/asiolink/tests/io_service_thread_pool_unittests.cc
+++ b/src/lib/asiolink/tests/io_service_thread_pool_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2022 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
--- a/src/lib/dhcpsrv/parsers/client_class_def_parser.h
+++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2022 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
--- a/src/lib/eval/eval_context.h
+++ b/src/lib/eval/eval_context.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2022 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
--- a/src/lib/http/client.h
+++ b/src/lib/http/client.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2022 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
--- a/src/lib/testutils/xml_reporting_test_lib.sh.in
+++ b/src/lib/testutils/xml_reporting_test_lib.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (C) 2020-2021 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2020-2022 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
--- a/src/lib/util/readwrite_mutex.h
+++ b/src/lib/util/readwrite_mutex.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-2022 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