[#3733] release changes

COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2009-2024 Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2009-2025 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

ChangeLog

@@ -1,3 +1,31 @@
+Kea 2.7.6 (development) released on January 29, 2025
+
+2323.	[func]*		fdupont
+	Kea now refuses secrets and passwords taken from examples,
+	including when not built with unit tests "keatest".
+	(Gitlab #3398)
+
+2322.	[bug]		marcin
+	Avoid conflicts in DNS cleanup performed by two servers in
+	the terminated state in HA.
+	(Gitlab #3649)
+
+2321.	[func]		tmark
+	Modified kea-dhcp4 and kea-dhcp6 to support
+	DDNS behavioral parameters at the pool level.
+	(Gitlab #3049)
+
+2320.	[bug]		fdupont
+	Fixed a bug where the lease in the released state was not read
+	properly.
+	(Gitlab #3699)
+
+2319.	[build]		fdupont, q66
+	Kea can now build with Boost 1.87. The minimum supported Boost
+	version has been bumped up from 1.57 to 1.66. Thanks to q66
+	for the patch.
+	(Gitlab #3696)
+
 2318.	[build]		razvan
 	The library version numbers have been bumped up for the Kea 2.7.6
 	development release.

changelog_unreleased/3049-permit-ddns-qualifying-suffix-option-in-pool-scope

@@ -1,4 +0,0 @@
-[func]		tmark
-	Modified kea-dhcp4 and kea-dhcp6 to support
-	DDNS behavioral parameters at the pool level.
-	(Gitlab #3049)

changelog_unreleased/3398-get-rid-of-default-credentials

@@ -1,4 +0,0 @@
-[func]*		fdupont
-	Kea now refuses secrets and passwords taken from examples,
-	including when not built with unit tests "keatest".
-	(Gitlab #3398)

changelog_unreleased/3649-ddns-cleanup-conflicts-in-the-ha-terminated-state

@@ -1,4 +0,0 @@
-[bug]		marcin
-	Avoid conflicts in DNS cleanup performed by two servers in
-	the terminated state in HA.
-	(Gitlab #3649)

changelog_unreleased/3696-make-kea-compatible-with-boost-1-87

@@ -1,5 +0,0 @@
-[build]		fdupont, q66
-	Kea can now build with Boost 1.87. The minimum supported Boost
-	version has been bumped up from 1.57 to 1.66. Thanks to q66
-	for the patch.
-	(Gitlab #3696)

changelog_unreleased/3699-fix-released-lease-read

@@ -1,3 +0,0 @@
-[bug]		fdupont
-	Fixed a bug where lease in released state was not read properly.
-	(Gitlab #3699)

doc/sphinx/conf.py

@@ -26,7 +26,7 @@ import api2doc  # noqa  # pylint: disable=wrong-import-position
 # -- Project information -----------------------------------------------------
 
 project = 'Kea'
-copyright = '2019-2024, Internet Systems Consortium'  # pylint: disable=redefined-builtin
+copyright = '2019-2025, Internet Systems Consortium'  # pylint: disable=redefined-builtin
 author = 'Internet Systems Consortium'
 
 # get current kea version

doc/sphinx/debug-messages.rst

@@ -299,12 +299,16 @@ Messages printed on debuglevel 40
 - HA_BUFFER6_RECEIVE_NOT_FOR_US
 - HA_BUFFER6_RECEIVE_PACKET_OPTIONS_SKIPPED
 - HA_BUFFER6_RECEIVE_UNPACK_FAILED
+- HA_LEASE4_EXPIRE_RECLAMATION_SKIP
+- HA_LEASE6_EXPIRE_RECLAMATION_SKIP
 - HA_LEASES4_COMMITTED_NOTHING_TO_UPDATE
 - HA_LEASES6_COMMITTED_NOTHING_TO_UPDATE
 - HA_LEASE_SYNC_STALE_LEASE4_SKIP
 - HA_LEASE_SYNC_STALE_LEASE6_SKIP
 - HA_LOAD_BALANCING_DUID_MISSING
 - HA_LOAD_BALANCING_IDENTIFIER_MISSING
+- HA_LOAD_BALANCING_LEASE_DUID_MISSING
+- HA_LOAD_BALANCING_LEASE_IDENTIFIER_MISSING
 - HA_SUBNET4_SELECT_NOT_FOR_US
 - HA_SUBNET4_SELECT_NO_SUBNET_SELECTED
 - HA_SUBNET6_SELECT_NOT_FOR_US

doc/sphinx/grammar/grammar-dhcp4-parser.rst

@@ -143,6 +143,9 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                  | ddns_use_conflict_resolution
                  | ddns_conflict_resolution_mode
                  | ddns_ttl_percent
+                 | ddns_ttl
+                 | ddns_ttl_min
+                 | ddns_ttl_max
                  | store_extended_info
                  | statistic_default_sample_count
                  | statistic_default_sample_age
@@ -222,6 +225,12 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
 
      ddns_ttl_percent ::= "ddns-ttl-percent" ":" FLOAT
 
+     ddns_ttl ::= "ddns-ttl" ":" INTEGER
+
+     ddns_ttl_min ::= "ddns-ttl-min" ":" INTEGER
+
+     ddns_ttl_max ::= "ddns-ttl-mix" ":" INTEGER
+
      hostname_char_set ::= "hostname-char-set" ":" STRING
 
      hostname_char_replacement ::= "hostname-char-replacement" ":" STRING
@@ -537,6 +546,9 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                   | ddns_use_conflict_resolution
                   | ddns_conflict_resolution_mode
                   | ddns_ttl_percent
+                  | ddns_ttl
+                  | ddns_ttl_min
+                  | ddns_ttl_max
                   | hostname_char_set
                   | hostname_char_replacement
                   | store_extended_info
@@ -624,6 +636,9 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                          | ddns_use_conflict_resolution
                          | ddns_conflict_resolution_mode
                          | ddns_ttl_percent
+                         | ddns_ttl
+                         | ddns_ttl_min
+                         | ddns_ttl_max
                          | hostname_char_set
                          | hostname_char_replacement
                          | store_extended_info
@@ -754,6 +769,20 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                | network_client_classes
                | require_client_classes
                | evaluate_additional_classes
+               | ddns_send_updates
+               | ddns_override_no_update
+               | ddns_override_client_update
+               | ddns_replace_client_name
+               | ddns_generated_prefix
+               | ddns_qualifying_suffix
+               | ddns_update_on_renew
+               | ddns_conflict_resolution_mode
+               | ddns_ttl_percent
+               | ddns_ttl
+               | ddns_ttl_min
+               | ddns_ttl_max
+               | hostname_char_set
+               | hostname_char_replacement
                | user_context
                | comment
                | unknown_map_entry

doc/sphinx/grammar/grammar-dhcp6-parser.rst

@@ -146,6 +146,9 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                  | ddns_use_conflict_resolution
                  | ddns_conflict_resolution_mode
                  | ddns_ttl_percent
+                 | ddns_ttl
+                 | ddns_ttl_min
+                 | ddns_ttl_max
                  | store_extended_info
                  | statistic_default_sample_count
                  | statistic_default_sample_age
@@ -220,6 +223,12 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
 
      ddns_ttl_percent ::= "ddns-ttl-percent" ":" FLOAT
 
+     ddns_ttl ::= "ddns-ttl" ":" INTEGER
+
+     ddns_ttl_min ::= "ddns-ttl-min" ":" INTEGER
+
+     ddns_ttl_max ::= "ddns-ttl-mix" ":" INTEGER
+
      hostname_char_set ::= "hostname-char-set" ":" STRING
 
      hostname_char_replacement ::= "hostname-char-replacement" ":" STRING
@@ -534,6 +543,9 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                   | ddns_use_conflict_resolution
                   | ddns_conflict_resolution_mode
                   | ddns_ttl_percent
+                  | ddns_ttl
+                  | ddns_ttl_min
+                  | ddns_ttl_max
                   | store_extended_info
                   | allocator
                   | pd_allocator
@@ -619,6 +631,9 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                          | ddns_use_conflict_resolution
                          | ddns_conflict_resolution_mode
                          | ddns_ttl_percent
+                         | ddns_ttl
+                         | ddns_ttl_min
+                         | ddns_ttl_max
                          | store_extended_info
                          | allocator
                          | pd_allocator
@@ -747,6 +762,20 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
                | network_client_classes
                | require_client_classes
                | evaluate_additional_classes
+               | ddns_send_updates
+               | ddns_override_no_update
+               | ddns_override_client_update
+               | ddns_replace_client_name
+               | ddns_generated_prefix
+               | ddns_qualifying_suffix
+               | ddns_update_on_renew
+               | ddns_conflict_resolution_mode
+               | ddns_ttl_percent
+               | ddns_ttl
+               | ddns_ttl_min
+               | ddns_ttl_max
+               | hostname_char_set
+               | hostname_char_replacement
                | user_context
                | comment
                | unknown_map_entry

doc/sphinx/kea-messages.rst

@@ -4047,7 +4047,7 @@ DHCP4_DB_RECONNECT_DISABLED
 
 .. code-block:: text
 
-    database reconnect is disabled: max-reconnect-tries %1, reconnect-wait-time %2
+    database reconnect is disabled: retries left: %1, reconnect wait time: %2, manager ID: %3, timer: %4
 
 This is an informational message indicating that connectivity to either the
 lease or host database or both and that automatic reconnect is not enabled.
@@ -4057,7 +4057,7 @@ DHCP4_DB_RECONNECT_FAILED
 
 .. code-block:: text
 
-    maximum number of database reconnect attempts: %1, has been exhausted without success
+    maximum number of database reconnect attempts: %1, has been exhausted without success, manager ID: %2, timer: %3
 
 This error indicates that the server failed to reconnect to the lease and/or
 host database(s) after making the maximum configured number of reconnect
@@ -4070,7 +4070,7 @@ DHCP4_DB_RECONNECT_LOST_CONNECTION
 
 .. code-block:: text
 
-    database connection lost.
+    database connection lost: manager ID: %1, timer: %2.
 
 This info message indicates that the connection has been lost and the dhcp
 service might have been disabled, as specified in the configuration, in order to
@@ -4093,7 +4093,7 @@ DHCP4_DB_RECONNECT_SUCCEEDED
 
 .. code-block:: text
 
-    database connection recovered.
+    database connection recovered: manager ID: %1, timer: %2.
 
 This info message indicates that the connection has been recovered and the dhcp
 service has been restored.
@@ -6241,7 +6241,7 @@ DHCP6_DB_RECONNECT_DISABLED
 
 .. code-block:: text
 
-    database reconnect is disabled: max-reconnect-tries %1, reconnect-wait-time %2
+    database reconnect is disabled: retries left: %1, reconnect wait time: %2, manager ID: %3, timer: %4
 
 This is an informational message indicating that connectivity to either the
 lease or host database or both and that automatic reconnect is not enabled.
@@ -6251,7 +6251,7 @@ DHCP6_DB_RECONNECT_FAILED
 
 .. code-block:: text
 
-    maximum number of database reconnect attempts: %1, has been exhausted without success
+    maximum number of database reconnect attempts: %1, has been exhausted without success, manager ID: %2, timer: %3
 
 This error indicates that the server failed to reconnect to the lease and/or
 host database(s) after making the maximum configured number of reconnect
@@ -6264,7 +6264,7 @@ DHCP6_DB_RECONNECT_LOST_CONNECTION
 
 .. code-block:: text
 
-    database connection lost.
+    database connection lost: manager ID: %1, timer: %2.
 
 This info message indicates that the connection has been lost and the dhcp
 service might have been disabled, as specified in the configuration, in order to
@@ -6287,7 +6287,7 @@ DHCP6_DB_RECONNECT_SUCCEEDED
 
 .. code-block:: text
 
-    database connection recovered.
+    database connection recovered: manager ID: %1, timer: %2.
 
 This info message indicates that the connection has been recovered and the dhcp
 service has been restored.
@@ -8585,6 +8585,21 @@ the database access parameters are changed: in the latter case, the
 server closes the currently open database, and opens a database using
 the new parameters.
 
+DHCPSRV_DDNS_TTL_TOO_LARGE
+==========================
+
+.. code-block:: text
+
+    %1 of lease life time %2 is %3, using maximum of %4 instead.
+
+Logged at debug log level 55.
+A debug message issued when the DDNS TTL value calculated using the
+ddns-ttl-percent if specified or (0.33 if not) is larger than the
+the specified value of ddns-ttl-max. Kea will ignore the value and
+use the specified maximum instead. The message details include
+the percentage, the lease life time, the calculated TTL, and the value
+actually used.
+
 DHCPSRV_DDNS_TTL_TOO_SMALL
 ==========================
 
@@ -10012,16 +10027,6 @@ A debug message issued when one of the registered interval timers
 is unregistered from the Timer Manager. The name of the timer is
 included in the message.
 
-DHCPSRV_UNKNOWN_DB
-==================
-
-.. code-block:: text
-
-    unknown database type: %1
-
-The database access string specified a database type (given in the
-message) that is unknown to the software. This is a configuration error.
-
 ****
 DHCP
 ****
@@ -12808,6 +12813,44 @@ and this server is not running in the load balancing mode. The server may only
 transition to the load-balancing state when it runs in the load balancing mode.
 The HA mode of both servers must be the same.
 
+HA_LEASE4_EXPIRE_FAILED
+=======================
+
+.. code-block:: text
+
+    lease4_expire callout failed: %1
+
+This error message is issued when the callout for the lease4_expire hook
+point failed. This includes unexpected errors like wrong arguments provided to
+the callout by the DHCP server (unlikely internal server error).
+The argument contains a reason for the error.
+
+HA_LEASE4_EXPIRE_INVALID_HA_SERVER_NAME
+=======================================
+
+.. code-block:: text
+
+    %1: invalid ha-server-name value for subnet %2
+
+This error message is issued when the reclaimed DHCPv4 lease belongs to
+a subnet which includes ha-server-name value in the user-context but this
+value is not a string or is empty. It is a server's misconifguration.
+The first argument holds the lease information. The second argument is a
+subnet prefix.
+
+HA_LEASE4_EXPIRE_RECLAMATION_SKIP
+=================================
+
+.. code-block:: text
+
+    %1: skipping reclamation of the lease that belongs to a partner
+
+Logged at debug log level 40.
+This debug message is issued when the server is in the terminated state and
+skips reclamation of the lease that was probably allocated by another server,
+or is maintained by the other server while the servers are in the HA terminated
+state. The argument is the lease address.
+
 HA_LEASE4_SERVER_DECLINE_FAILED
 ===============================
 
@@ -12820,6 +12863,44 @@ point failed. This includes unexpected errors like wrong arguments provided to
 the callout by the DHCP server (unlikely internal server error).
 The argument contains a reason for the error.
 
+HA_LEASE6_EXPIRE_FAILED
+=======================
+
+.. code-block:: text
+
+    lease4_expire callout failed: %1
+
+This error message is issued when the callout for the lease4_expire hook
+point failed. This includes unexpected errors like wrong arguments provided to
+the callout by the DHCP server (unlikely internal server error).
+The argument contains a reason for the error.
+
+HA_LEASE6_EXPIRE_INVALID_HA_SERVER_NAME
+=======================================
+
+.. code-block:: text
+
+    %1: invalid ha-server-name value for subnet %2
+
+This error message is issued when the reclaimed DHCPv6 lease belongs to
+a subnet which includes ha-server-name value in the user-context but this
+value is not a string or is empty. It is a server's misconifguration.
+The first argument holds the lease information. The second argument is a
+subnet prefix.
+
+HA_LEASE6_EXPIRE_RECLAMATION_SKIP
+=================================
+
+.. code-block:: text
+
+    %1: skipping reclamation of the lease that belongs to a partner
+
+Logged at debug log level 40.
+This debug message is issued when the server is in the terminated state and
+skips reclamation of the lease that was probably allocated by another server,
+or is maintained by the other server while the servers are in the HA terminated
+state. The argument is the lease address.
+
 HA_LEASES4_COMMITTED_FAILED
 ===========================
 
@@ -13171,6 +13252,30 @@ balance an incoming DHCPv4 query because neither client identifier nor
 HW address was included in the query. The query will be dropped. The
 sole argument contains transaction id.
 
+HA_LOAD_BALANCING_LEASE_DUID_MISSING
+====================================
+
+.. code-block:: text
+
+    %1: load balancing failed for the DHCPv6 lease %2 because DUID is missing
+
+Logged at debug log level 40.
+This debug message is issued when the HA hook library was unable to load
+balance a reclaimed DHCPv6 lease because client identifier was not included
+found in the lease.
+
+HA_LOAD_BALANCING_LEASE_IDENTIFIER_MISSING
+==========================================
+
+.. code-block:: text
+
+    %1: load balancing failed for the DHCPv4 lease %2 because HW address and client identifier are missing
+
+Logged at debug log level 40.
+This debug message is issued when the HA hook library was unable to load
+balance a reclaimed DHCPv4 lease because neither client identifier nor
+HW address was included in the query.
+
 HA_LOCAL_DHCP_DISABLE
 =====================
 
@@ -15854,6 +15959,26 @@ This informational message indicates that the server has started
 HTTP/HTTPS service on the specified address and port for receiving
 control commands.
 
+HTTP_COMMAND_MGR_SERVICE_STOPPING
+=================================
+
+.. code-block:: text
+
+    Server is stopping %1 service %2
+
+This informational message indicates that the server has stopped
+HTTP/HTTPS service. When known the address and port are displayed.
+
+HTTP_COMMAND_MGR_SERVICE_STOPPING_ALL
+=====================================
+
+.. code-block:: text
+
+    stopping %1 service %2
+
+This informational message indicates that the server has stopped
+HTTP/HTTPS service. When known the address and port are displayed.
+
 HTTP_CONNECTION_CLOSE_CALLBACK_FAILED
 =====================================
 

doc/sphinx/man/kea-admin.8.rst

@@ -1,5 +1,5 @@
 ..
-   Copyright (C) 2019-2024 Internet Systems Consortium, Inc. ("ISC")
+   Copyright (C) 2019-2025 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

fuzz/fuzz_packets_kea_dhcp4.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

fuzz/fuzz_packets_kea_dhcp6.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

fuzz/fuzz_unix_socket_kea_dhcp4.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

fuzz/fuzz_unix_socket_kea_dhcp6.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

src/bin/admin/admin-utils.sh.in

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2023 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 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

src/bin/admin/tests/mysql_tests.sh.in

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 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

src/bin/admin/tests/pgsql_tests.sh.in

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2025 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

src/bin/agent/ca_process.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2025 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

src/bin/agent/ca_process.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2025 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

src/bin/agent/tests/get_config_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/bin/d2/d2_controller.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 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

src/bin/d2/d2_lexer.cc

@@ -1,6 +1,6 @@
-#line 2 "d2_lexer.cc"
+#line 1 "d2_lexer.cc"
 
-#line 4 "d2_lexer.cc"
+#line 3 "d2_lexer.cc"
 
 #define  YY_INT_ALIGNED short int
 
@@ -1171,7 +1171,7 @@ static const flex_int16_t yy_rule_linenum[90] =
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "d2_lexer.ll"
-/* Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2017-2025 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
@@ -1214,7 +1214,7 @@ unsigned int comment_start_line = 0;
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::d2::D2ParserContext::fatal(msg)
-#line 1218 "d2_lexer.cc"
+#line 1217 "d2_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
@@ -1240,8 +1240,8 @@ unsigned int comment_start_line = 0;
    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 1243 "d2_lexer.cc"
 #line 1244 "d2_lexer.cc"
-#line 1245 "d2_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -1561,7 +1561,7 @@ YY_DECL
     }
 
 
-#line 1565 "d2_lexer.cc"
+#line 1564 "d2_lexer.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -2812,7 +2812,7 @@ YY_RULE_SETUP
 #line 1022 "d2_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 2816 "d2_lexer.cc"
+#line 2815 "d2_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{

src/bin/d2/d2_lexer.ll

@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2017-2025 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

src/bin/d2/d2_parser.yy

@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2017-2025 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

src/bin/d2/d2_process.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 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

src/bin/d2/d2_process.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 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

src/bin/d2/tests/d2_cfg_mgr_unittests.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 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

src/bin/d2/tests/d2_http_command_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/bin/d2/tests/d2_process_unittests.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 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

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
 
@@ -2278,7 +2278,7 @@ using namespace isc::dhcp;
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg)
-#line 2282 "dhcp4_lexer.cc"
+#line 2281 "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
@@ -2304,8 +2304,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 2307 "dhcp4_lexer.cc"
 #line 2308 "dhcp4_lexer.cc"
-#line 2309 "dhcp4_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -2633,7 +2633,7 @@ YY_DECL
     }
 
 
-#line 2637 "dhcp4_lexer.cc"
+#line 2636 "dhcp4_lexer.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -5887,7 +5887,7 @@ YY_RULE_SETUP
 #line 2575 "dhcp4_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 5891 "dhcp4_lexer.cc"
+#line 5890 "dhcp4_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{

src/bin/dhcp4/json_config_parser.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/bin/dhcp4/tests/dhcp4_srv_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/bin/dhcp4/tests/http_control_socket_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/bin/dhcp6/ctrl_dhcp6_srv.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2025 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

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
 
@@ -2251,7 +2251,7 @@ using namespace isc::dhcp;
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser6Context::fatal(msg)
-#line 2255 "dhcp6_lexer.cc"
+#line 2254 "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
@@ -2277,8 +2277,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 2280 "dhcp6_lexer.cc"
 #line 2281 "dhcp6_lexer.cc"
-#line 2282 "dhcp6_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -2608,7 +2608,7 @@ YY_DECL
     }
 
 
-#line 2612 "dhcp6_lexer.cc"
+#line 2611 "dhcp6_lexer.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -5902,7 +5902,7 @@ YY_RULE_SETUP
 #line 2608 "dhcp6_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 5906 "dhcp6_lexer.cc"
+#line 5905 "dhcp6_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{

src/bin/dhcp6/dhcp6_srv.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/bin/dhcp6/dhcp6_srv.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/bin/dhcp6/json_config_parser.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/bin/dhcp6/tests/config_parser_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/bin/dhcp6/tests/dhcp6_srv_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/bin/dhcp6/tests/fqdn_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 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

src/bin/dhcp6/tests/get_config_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/bin/dhcp6/tests/http_control_socket_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/hooks/dhcp/high_availability/ha_callouts.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/hooks/dhcp/high_availability/ha_impl.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/ha_impl.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/ha_messages.mes

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017-2025 Internet Systems Consortium, Inc. ("ISC")
 
 $NAMESPACE isc::ha
 
@@ -274,12 +274,52 @@ and this server is not running in the load balancing mode. The server may only
 transition to the load-balancing state when it runs in the load balancing mode.
 The HA mode of both servers must be the same.
 
+% HA_LEASE4_EXPIRE_FAILED lease4_expire callout failed: %1
+This error message is issued when the callout for the lease4_expire hook
+point failed. This includes unexpected errors like wrong arguments provided to
+the callout by the DHCP server (unlikely internal server error).
+The argument contains a reason for the error.
+
+% HA_LEASE4_EXPIRE_INVALID_HA_SERVER_NAME %1: invalid ha-server-name value for subnet %2
+This error message is issued when the reclaimed DHCPv4 lease belongs to
+a subnet which includes ha-server-name value in the user-context but this
+value is not a string or is empty. It is a server's misconifguration.
+The first argument holds the lease information. The second argument is a
+subnet prefix.
+
+% HA_LEASE4_EXPIRE_RECLAMATION_SKIP %1: skipping reclamation of the lease that belongs to a partner
+Logged at debug log level 40.
+This debug message is issued when the server is in the terminated state and
+skips reclamation of the lease that was probably allocated by another server,
+or is maintained by the other server while the servers are in the HA terminated
+state. The argument is the lease address.
+
 % HA_LEASE4_SERVER_DECLINE_FAILED lease4_server_decline callout failed: %1
 This error message is issued when the callout for the lease4_server_decline hook
 point failed. This includes unexpected errors like wrong arguments provided to
 the callout by the DHCP server (unlikely internal server error).
 The argument contains a reason for the error.
 
+% HA_LEASE6_EXPIRE_FAILED lease4_expire callout failed: %1
+This error message is issued when the callout for the lease4_expire hook
+point failed. This includes unexpected errors like wrong arguments provided to
+the callout by the DHCP server (unlikely internal server error).
+The argument contains a reason for the error.
+
+% HA_LEASE6_EXPIRE_INVALID_HA_SERVER_NAME %1: invalid ha-server-name value for subnet %2
+This error message is issued when the reclaimed DHCPv6 lease belongs to
+a subnet which includes ha-server-name value in the user-context but this
+value is not a string or is empty. It is a server's misconifguration.
+The first argument holds the lease information. The second argument is a
+subnet prefix.
+
+% HA_LEASE6_EXPIRE_RECLAMATION_SKIP %1: skipping reclamation of the lease that belongs to a partner
+Logged at debug log level 40.
+This debug message is issued when the server is in the terminated state and
+skips reclamation of the lease that was probably allocated by another server,
+or is maintained by the other server while the servers are in the HA terminated
+state. The argument is the lease address.
+
 % HA_LEASES4_COMMITTED_FAILED leases4_committed callout failed: %1
 This error message is issued when the callout for the leases4_committed hook
 point failed. This includes unexpected errors like wrong arguments provided to
@@ -449,46 +489,6 @@ number of lease updates for which a conflict status code was returned
 by the partner exceeds the limit set with max-rejected-lease-updates
 configuration parameter.
 
-% HA_LEASE4_EXPIRE_FAILED lease4_expire callout failed: %1
-This error message is issued when the callout for the lease4_expire hook
-point failed. This includes unexpected errors like wrong arguments provided to
-the callout by the DHCP server (unlikely internal server error).
-The argument contains a reason for the error.
-
-% HA_LEASE4_EXPIRE_INVALID_HA_SERVER_NAME %1: invalid ha-server-name value for subnet %2
-This error message is issued when the reclaimed DHCPv4 lease belongs to
-a subnet which includes ha-server-name value in the user-context but this
-value is not a string or is empty. It is a server's misconifguration.
-The first argument holds the lease information. The second argument is a
-subnet prefix.
-
-% HA_LEASE4_EXPIRE_RECLAMATION_SKIP %1: skipping reclamation of the lease that belongs to a partner
-Logged at debug log level 40.
-This debug message is issued when the server is in the terminated state and
-skips reclamation of the lease that was probably allocated by another server,
-or is maintained by the other server while the servers are in the HA terminated
-state. The argument is the lease address.
-
-% HA_LEASE6_EXPIRE_FAILED lease4_expire callout failed: %1
-This error message is issued when the callout for the lease4_expire hook
-point failed. This includes unexpected errors like wrong arguments provided to
-the callout by the DHCP server (unlikely internal server error).
-The argument contains a reason for the error.
-
-% HA_LEASE6_EXPIRE_INVALID_HA_SERVER_NAME %1: invalid ha-server-name value for subnet %2
-This error message is issued when the reclaimed DHCPv6 lease belongs to
-a subnet which includes ha-server-name value in the user-context but this
-value is not a string or is empty. It is a server's misconifguration.
-The first argument holds the lease information. The second argument is a
-subnet prefix.
-
-% HA_LEASE6_EXPIRE_RECLAMATION_SKIP %1: skipping reclamation of the lease that belongs to a partner
-Logged at debug log level 40.
-This debug message is issued when the server is in the terminated state and
-skips reclamation of the lease that was probably allocated by another server,
-or is maintained by the other server while the servers are in the HA terminated
-state. The argument is the lease address.
-
 % HA_LOAD_BALANCING_DUID_MISSING %1: load balancing failed for the DHCPv6 message (transaction id: %2) because DUID is missing
 Logged at debug log level 40.
 This debug message is issued when the HA hook library was unable to load

src/hooks/dhcp/high_availability/ha_service.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/ha_service.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/query_filter.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/query_filter.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/tests/ha_impl_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/high_availability/tests/ha_test.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/hooks/dhcp/high_availability/tests/ha_test.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/hooks/dhcp/high_availability/tests/query_filter_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/lease_cmds/lease_parser.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/hooks/dhcp/mysql/mysql_cb_dhcp4.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/mysql/mysql_cb_dhcp6.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/mysql/mysql_cb_impl.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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

src/hooks/dhcp/mysql/mysql_host_data_source.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2025 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

src/hooks/dhcp/mysql/mysql_lease_mgr.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/hooks/dhcp/mysql/tests/mysql_host_data_source_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2025 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

src/hooks/dhcp/mysql/tests/mysql_lease_mgr_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 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

src/hooks/dhcp/pgsql/pgsql_cb_dhcp4.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2025 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

src/hooks/dhcp/pgsql/pgsql_cb_dhcp6.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-2025 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

src/hooks/dhcp/pgsql/pgsql_cb_impl.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2025 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

src/hooks/dhcp/pgsql/pgsql_host_data_source.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2025 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

src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2025 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

src/hooks/dhcp/pgsql/tests/pgsql_host_data_source_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2025 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

src/hooks/dhcp/pgsql/tests/pgsql_lease_mgr_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2025 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

src/lib/asiodns/tests/io_fetch_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/lib/asiolink/io_acceptor.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/lib/asiolink/io_address.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2025 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

src/lib/asiolink/io_service.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/lib/asiolink/io_service.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/lib/asiolink/io_socket.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2025 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

src/lib/asiolink/tcp_endpoint.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/lib/asiolink/tcp_socket.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/lib/asiolink/tests/tcp_acceptor_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2025 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

src/lib/asiolink/tests/tls_acceptor_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2025 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

src/lib/asiolink/tests/tls_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2025 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

src/lib/asiolink/tls_socket.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2025 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

src/lib/asiolink/udp_endpoint.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/lib/asiolink/udp_socket.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2025 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

src/lib/asiolink/unix_domain_socket.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 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

src/lib/cc/default_credentials.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

src/lib/cc/default_credentials.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

src/lib/config/command_mgr.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2025 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

src/lib/config/config_messages.cc

@@ -75,9 +75,9 @@ const char* values[] = {
     "COMMAND_WATCH_SOCKET_MARK_READY_ERROR", "watch socket failed to mark ready: %1",
     "HTTP_COMMAND_MGR_IGNORED_TLS_SETUP_CHANGES", "ignore a change in TLS setup of the http control socket",
     "HTTP_COMMAND_MGR_SERVICE_STARTED", "started %1 service bound to address %2 port %3",
-    "HTTP_COMMAND_MGR_SERVICE_STOPPING", "stopping %1 service %2",
+    "HTTP_COMMAND_MGR_SERVICE_STOPPING", "Server is stopping %1 service %2",
     "HTTP_COMMAND_MGR_SERVICE_STOPPING_ALL", "stopping %1 service %2",
-    "HTTP_COMMAND_MGR_SERVICE_STOPPING_NO_DATA", "stopping %1 service %2",
+    "HTTP_COMMAND_MGR_SERVICE_STOPPING_NO_DATA", "Server is stopping all services including %1 service %2",
     NULL
 };
 

src/lib/config/config_messages.mes

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2025 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
@@ -168,11 +168,11 @@ control commands.
 This informational message indicates that the server has stopped
 HTTP/HTTPS service. When known the address and port are displayed.
 
+% HTTP_COMMAND_MGR_SERVICE_STOPPING_ALL stopping %1 service %2
+This informational message indicates that the server has stopped
+HTTP/HTTPS service. When known the address and port are displayed.
+
 % HTTP_COMMAND_MGR_SERVICE_STOPPING_NO_DATA Server is stopping all services including %1 service %2
 This informational message indicates that the server is stopping all
 HTTP/HTTPS services. When known the address and port are displayed for
 each service.
-
-% HTTP_COMMAND_MGR_SERVICE_STOPPING_ALL stopping %1 service %2
-This informational message indicates that the server has stopped
-HTTP/HTTPS service. When known the address and port are displayed.

src/lib/config/http_command_config.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2025 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

src/lib/config/http_command_config.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

src/lib/config/http_command_mgr.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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

src/lib/config/http_command_mgr.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2024-2025 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