summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog52
-rw-r--r--changelog_unreleased/3390-ntp-server-option5
-rw-r--r--changelog_unreleased/3404-option1226
-rw-r--r--changelog_unreleased/3552-drop-botan-without-tls6
-rw-r--r--changelog_unreleased/3582-vendor-options-in-classes4
-rw-r--r--changelog_unreleased/3585-relax-backend-type6
-rw-r--r--changelog_unreleased/3588-required-no-test6
-rw-r--r--changelog_unreleased/3590-required-precedence6
-rw-r--r--changelog_unreleased/3605-integrate-clusterfuzzlite-libfuzzer-oss-fuzz-in-the-main-core-kea-repo4
-rw-r--r--doc/sphinx/conf.py2
-rw-r--r--doc/sphinx/debug-messages.rst12
-rw-r--r--doc/sphinx/grammar/grammar-dhcp4-parser.rst17
-rw-r--r--doc/sphinx/grammar/grammar-dhcp6-parser.rst18
-rw-r--r--doc/sphinx/kea-messages.rst212
-rw-r--r--doc/sphinx/umls.rst2
-rw-r--r--src/bin/agent/parser_context.cc2
-rw-r--r--src/bin/dhcp4/dhcp4_lexer.cc12
-rw-r--r--src/bin/dhcp4/dhcp4_messages.mes44
-rw-r--r--src/bin/dhcp4/main.cc2
-rw-r--r--src/bin/dhcp4/tests/decline_unittest.cc2
-rw-r--r--src/bin/dhcp6/dhcp6_lexer.cc12
-rw-r--r--src/bin/dhcp6/dhcp6_messages.mes44
-rw-r--r--src/bin/dhcp6/main.cc2
-rw-r--r--src/bin/dhcp6/tests/decline_unittest.cc2
-rw-r--r--src/bin/netconf/parser_context.cc2
-rw-r--r--src/hooks/dhcp/mysql/mysql_cb_dhcp4.h2
-rw-r--r--src/hooks/dhcp/mysql/mysql_cb_dhcp6.h2
-rw-r--r--src/hooks/dhcp/mysql/mysql_cb_log.cc2
-rw-r--r--src/hooks/dhcp/mysql/mysql_cb_log.h2
-rw-r--r--src/hooks/dhcp/mysql/mysql_hb_log.cc2
-rw-r--r--src/hooks/dhcp/mysql/mysql_hb_log.h2
-rw-r--r--src/hooks/dhcp/mysql/mysql_hb_messages.mes1
-rw-r--r--src/hooks/dhcp/mysql/mysql_lb_log.cc2
-rw-r--r--src/hooks/dhcp/mysql/mysql_lb_log.h2
-rw-r--r--src/hooks/dhcp/mysql/mysql_lb_messages.mes37
-rw-r--r--src/hooks/dhcp/mysql/mysql_query_macros_dhcp.h2
-rw-r--r--src/hooks/dhcp/mysql/tests/mysql_cb_dhcp4_mgr_unittest.cc2
-rw-r--r--src/hooks/dhcp/mysql/tests/mysql_cb_dhcp6_mgr_unittest.cc2
-rw-r--r--src/hooks/dhcp/mysql/tests/mysql_cb_impl_unittest.cc2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_cb_dhcp4.h2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_cb_dhcp6.h2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_cb_log.cc2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_cb_log.h2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_hb_log.cc2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_hb_log.h2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_hb_messages.mes1
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_lb_log.cc2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_lb_log.h2
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_lb_messages.mes37
-rw-r--r--src/hooks/dhcp/pgsql/pgsql_query_macros_dhcp.h2
-rw-r--r--src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp4_mgr_unittest.cc2
-rw-r--r--src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp6_mgr_unittest.cc2
-rw-r--r--src/hooks/dhcp/pgsql/tests/pgsql_cb_impl_unittest.cc2
-rw-r--r--src/lib/asiolink/crypto_tls.h2
-rw-r--r--src/lib/cc/tests/data_unittests.cc2
-rw-r--r--src/lib/config_backend/base_config_backend_mgr.h2
-rw-r--r--src/lib/config_backend/constants.h2
-rw-r--r--src/lib/dhcp/classify.h2
-rw-r--r--src/lib/dhcp/packet_queue_mgr4.h2
-rw-r--r--src/lib/dhcp/packet_queue_mgr6.h2
-rw-r--r--src/lib/dhcpsrv/config_backend_dhcp4_mgr.h2
-rw-r--r--src/lib/dhcpsrv/config_backend_dhcp6_mgr.h2
-rw-r--r--src/lib/dhcpsrv/database_backends.dox2
-rw-r--r--src/lib/dhcpsrv/dhcpsrv_messages.mes24
-rw-r--r--src/lib/dhcpsrv/ip_range_permutation.h2
-rw-r--r--src/lib/dhcpsrv/libdhcpsrv.dox2
-rw-r--r--src/lib/dhcpsrv/pool.h2
-rw-r--r--src/lib/process/tests/log_parser_unittests.cc2
-rw-r--r--src/lib/util/bigints.h2
69 files changed, 352 insertions, 308 deletions
diff --git a/ChangeLog b/ChangeLog
index e4d370d6b0..b1edae2a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+Kea 2.7.4 (development) released on October 30, 2024
+
+2301. [func] fdupont
+ Added support of DHCPv4 "cablelab-client-conf" (122) option
+ and its associated suboptions specified by RFC 3495, 3594
+ and 3634 in the "cablelabs-client-conf" space at the
+ exception of the suboption 3.
+ (Gitlab #3404)
+
+2300. [build, func] andrei
+ Standalone fuzz target binaries used in fuzz testing were added
+ to the "fuzz" directory.
+ (Gitlab #3605)
+
+2299. [func]* fdupont
+ Required classes are now evaluated in the same order as
+ for option data, i.e. (pd-)pool, subnet and shared network.
+ Before the order was reversed but this feature was not
+ used.
+ (Gitlab #3590)
+
+2298. [bug] fdupont
+ Fixed a bug where Kea did not return the value of
+ vendor-encapsulated-options when redefined in a client class.
+ (Gitlab #3582)
+
+2297. [build]* fdupont
+ Made the Botan boost TLS support mandatory. Changed
+ the configure argument to --with-botan using
+ the Botan pkg-config library name e.g. "botan-2".
+ (Gitlab #3552)
+
+2296. [func]* fdupont
+ Classes included in 'require-client-classes' that do
+ not have test expressions will now be unconditionally
+ added to the client's list of matching classes.
+ Previously they were ignored.
+ (Gitlab #3388)
+
+2295. [func] fdupont
+ Relaxed the lease, host and config database backend types
+ in the configuration syntax. This change is introduced to
+ better handle optional backends provided in hooks, such as
+ currently available MySQL or PostgreSQL hooks.
+ (Gitlab #3585)
+
+2294. [func] fdupont
+ Added support of DHCPv6 "ntp-server" (56) option
+ specified by RFC 5908 and its associated suboptions
+ in the "v6-ntp-server-suboptions" space.
+ (Gitlab #3390)
+
2293. [build] razvan
The library version numbers have been bumped up for the Kea 2.7.4
development release.
diff --git a/changelog_unreleased/3390-ntp-server-option b/changelog_unreleased/3390-ntp-server-option
deleted file mode 100644
index e8c02bcde3..0000000000
--- a/changelog_unreleased/3390-ntp-server-option
+++ /dev/null
@@ -1,5 +0,0 @@
-[func] fdupont
- Added support of DHCPv6 "ntp-server" (56) option
- specified by RFC 5908 and its associated suboptions
- in the "v6-ntp-server-suboptions" space.
- (Gitlab #3390)
diff --git a/changelog_unreleased/3404-option122 b/changelog_unreleased/3404-option122
deleted file mode 100644
index 99bec808e8..0000000000
--- a/changelog_unreleased/3404-option122
+++ /dev/null
@@ -1,6 +0,0 @@
-[func] fdupont
- Added support of DHCPv4 "cablelab-client-conf" (122) option
- and its associated suboptions specified by RFC 3495, 3594
- and 3634 in the "cablelabs-client-conf" space at the
- exception of the suboption 3.
- (Gitlab #3404)
diff --git a/changelog_unreleased/3552-drop-botan-without-tls b/changelog_unreleased/3552-drop-botan-without-tls
deleted file mode 100644
index 1399efc63e..0000000000
--- a/changelog_unreleased/3552-drop-botan-without-tls
+++ /dev/null
@@ -1,6 +0,0 @@
-[build]* fdupont
- Made the Botan boost TLS support mandatory. Changed
- the configure argument to --with-botan using
- the Botan pkg-config library name e.g. "botan-2".
- (Gitlab #3552)
-
diff --git a/changelog_unreleased/3582-vendor-options-in-classes b/changelog_unreleased/3582-vendor-options-in-classes
deleted file mode 100644
index 7b33d08195..0000000000
--- a/changelog_unreleased/3582-vendor-options-in-classes
+++ /dev/null
@@ -1,4 +0,0 @@
-[bug] fdupont
- Fixed a bug where Kea did not return the value of
- vendor-encapsulated-options when redefined in a client class.
- (Gitlab #3582)
diff --git a/changelog_unreleased/3585-relax-backend-type b/changelog_unreleased/3585-relax-backend-type
deleted file mode 100644
index b5526281f0..0000000000
--- a/changelog_unreleased/3585-relax-backend-type
+++ /dev/null
@@ -1,6 +0,0 @@
-[func] fdupont
- Relaxed the lease, host and config database backend types
- in the configuration syntax. This change is introduced to
- better handle optional backends provided in hooks, such as
- currently available MySQL or PostgreSQL hooks.
- (Gitlab #3585)
diff --git a/changelog_unreleased/3588-required-no-test b/changelog_unreleased/3588-required-no-test
deleted file mode 100644
index f978c8fd29..0000000000
--- a/changelog_unreleased/3588-required-no-test
+++ /dev/null
@@ -1,6 +0,0 @@
-[func]* fdupont
- Classes included in 'require-client-classes' that do
- not have test expressions will now be unconditionally
- added to the client's list of matching classes.
- Previously they were ignored.
- (Gitlab #3388)
diff --git a/changelog_unreleased/3590-required-precedence b/changelog_unreleased/3590-required-precedence
deleted file mode 100644
index c8a478256d..0000000000
--- a/changelog_unreleased/3590-required-precedence
+++ /dev/null
@@ -1,6 +0,0 @@
-[func]* fdupont
- Required classes are now evaluated in the same order as
- for option data, i.e. (pd-)pool, subnet and shared network.
- Before the order was reversed but this feature was not
- used.
- (Gitlab #3590)
diff --git a/changelog_unreleased/3605-integrate-clusterfuzzlite-libfuzzer-oss-fuzz-in-the-main-core-kea-repo b/changelog_unreleased/3605-integrate-clusterfuzzlite-libfuzzer-oss-fuzz-in-the-main-core-kea-repo
deleted file mode 100644
index f4073f5205..0000000000
--- a/changelog_unreleased/3605-integrate-clusterfuzzlite-libfuzzer-oss-fuzz-in-the-main-core-kea-repo
+++ /dev/null
@@ -1,4 +0,0 @@
-[build, func] andrei
- Standalone fuzz target binaries used in fuzz testing were added
- to the "fuzz" directory.
- (Gitlab #3605)
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 8ebe94ca59..9d22903b35 100644
--- a/doc/sphinx/conf.py
+++ b/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-2024, Internet Systems Consortium'
author = 'Internet Systems Consortium'
# get current kea version
diff --git a/doc/sphinx/debug-messages.rst b/doc/sphinx/debug-messages.rst
index 4ceac072a3..349b6ae469 100644
--- a/doc/sphinx/debug-messages.rst
+++ b/doc/sphinx/debug-messages.rst
@@ -163,13 +163,13 @@ Messages printed on debuglevel 40
- DDNS_TUNING6_SKIPPING_DDNS
- DDNS_TUNING_SUBNET_EXPRESSION_PARSE
- DDNS_TUNING_SUBNET_EXPR_CACHED
+- DHCP4_ADDITIONAL_CLASS_NO_TEST
+- DHCP4_ADDITIONAL_CLASS_UNDEFINED
- DHCP4_BUFFER_RECEIVED
- DHCP4_CLASSES_ASSIGNED
- DHCP4_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION
- DHCP4_CLASS_ASSIGNED
- DHCP4_CLASS_UNCONFIGURED
-- DHCP4_CLASS_UNDEFINED
-- DHCP4_CLASS_UNTESTABLE
- DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP
- DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_SKIP
- DHCP4_DHCP4O6_PACKET_RECEIVED
@@ -188,13 +188,13 @@ Messages printed on debuglevel 40
- DHCP4_PACKET_QUEUE_FULL
- DHCP4_SHUTDOWN
- DHCP4_SHUTDOWN_REQUEST
+- DHCP6_ADDITIONAL_CLASS_NO_TEST
+- DHCP6_ADDITIONAL_CLASS_UNDEFINED
- DHCP6_BUFFER_RECEIVED
- DHCP6_CLASSES_ASSIGNED
- DHCP6_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION
- DHCP6_CLASS_ASSIGNED
- DHCP6_CLASS_UNCONFIGURED
-- DHCP6_CLASS_UNDEFINED
-- DHCP6_CLASS_UNTESTABLE
- DHCP6_DHCP4O6_PACKET_RECEIVED
- DHCP6_FLEX_ID
- DHCP6_HOOK_BUFFER_SEND_SKIP
@@ -902,6 +902,7 @@ Messages printed on debuglevel 50
- ALLOC_ENGINE_V6_EXTEND_LEASE
- ASIODNS_READ_TIMEOUT
+- DHCP4_ADDITIONAL_CLASS_EVAL_RESULT
- DHCP4_BUFFER_UNPACK
- DHCP4_BUFFER_WAIT_SIGNAL
- DHCP4_CLIENTID_IGNORED_FOR_LEASES
@@ -929,10 +930,10 @@ Messages printed on debuglevel 50
- DHCP4_RELEASE_FAIL_NO_LEASE
- DHCP4_RELEASE_FAIL_WRONG_CLIENT
- DHCP4_REQUEST
-- DHCP4_REQUIRED_CLASS_EVAL_RESULT
- DHCP4_RESPONSE_HOSTNAME_GENERATE
- DHCP4_SUBNET_SELECTION_FAILED
- DHCP4_UNKNOWN_ADDRESS_REQUESTED
+- DHCP6_ADDITIONAL_CLASS_EVAL_RESULT
- DHCP6_ADD_GLOBAL_STATUS_CODE
- DHCP6_ADD_STATUS_CODE_FOR_IA
- DHCP6_BUFFER_UNPACK
@@ -964,7 +965,6 @@ Messages printed on debuglevel 50
- DHCP6_PROCESS_IA_PD_REQUEST
- DHCP6_PROCESS_IA_PD_SOLICIT
- DHCP6_RAPID_COMMIT
-- DHCP6_REQUIRED_CLASS_EVAL_RESULT
- DHCP6_SUBNET_SELECTION_FAILED
- DHCPSRV_DHCP_DDNS_NCR_SENT
- DHCPSRV_EVAL_RESULT
diff --git a/doc/sphinx/grammar/grammar-dhcp4-parser.rst b/doc/sphinx/grammar/grammar-dhcp4-parser.rst
index f2c7a45923..256bb72138 100644
--- a/doc/sphinx/grammar/grammar-dhcp4-parser.rst
+++ b/doc/sphinx/grammar/grammar-dhcp4-parser.rst
@@ -337,11 +337,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
| cipher_list
| unknown_map_entry
- database_type ::= "type" ":" db_type
-
- db_type ::= "memfile"
- | "mysql"
- | "postgresql"
+ database_type ::= "type" ":" STRING
user ::= "user" ":" STRING
@@ -509,6 +505,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
| id
| client_class
| require_client_classes
+ | evaluate_additional_classes
| reservations
| reservations_global
| reservations_in_subnet
@@ -560,6 +557,8 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
require_client_classes ::= "require-client-classes" ":" list_strings
+ evaluate_additional_classes ::= "evaluate-additional-classes" ":" list_strings
+
reservations_global ::= "reservations-global" ":" BOOLEAN
reservations_in_subnet ::= "reservations-in-subnet" ":" BOOLEAN
@@ -600,6 +599,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
| reservations_out_of_pool
| client_class
| require_client_classes
+ | evaluate_additional_classes
| valid_lifetime
| min_valid_lifetime
| max_valid_lifetime
@@ -707,6 +707,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
| option_data_never_send
| user_context
| comment
+ | option_data_client_classes
| unknown_map_entry
option_data_name ::= name
@@ -723,6 +724,8 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
option_data_never_send ::= "never-send" ":" BOOLEAN
+ option_data_client_classes ::= "client-classes" ":" list_strings
+
pools_list ::= "pools" ":" "[" pools_list_content "]"
pools_list_content ::=
@@ -745,6 +748,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
| option_data_list
| client_class
| require_client_classes
+ | evaluate_additional_classes
| user_context
| comment
| unknown_map_entry
@@ -840,6 +844,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
| client_class_test
| client_class_template_test
| only_if_required
+ | only_in_additional_list
| option_def_list
| option_data_list
| next_server
@@ -861,6 +866,8 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
only_if_required ::= "only-if-required" ":" BOOLEAN
+ only_in_additional_list ::= "only-in-additional-list" ":" BOOLEAN
+
dhcp4o6_port ::= "dhcp4o6-port" ":" INTEGER
control_socket ::= "control-socket" ":" "{" control_socket_params "}"
diff --git a/doc/sphinx/grammar/grammar-dhcp6-parser.rst b/doc/sphinx/grammar/grammar-dhcp6-parser.rst
index 22d8402329..63c33e391a 100644
--- a/doc/sphinx/grammar/grammar-dhcp6-parser.rst
+++ b/doc/sphinx/grammar/grammar-dhcp6-parser.rst
@@ -314,11 +314,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| cipher_list
| unknown_map_entry
- database_type ::= "type" ":" db_type
-
- db_type ::= "memfile"
- | "mysql"
- | "postgresql"
+ database_type ::= "type" ":" STRING
user ::= "user" ":" STRING
@@ -512,6 +508,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| rapid_commit
| client_class
| require_client_classes
+ | evaluate_additional_classes
| reservations
| reservations_global
| reservations_in_subnet
@@ -551,6 +548,8 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
require_client_classes ::= "require-client-classes" ":" list_strings
+ evaluate_additional_classes ::= "evaluate-additional-classes" ":" list_strings
+
reservations_global ::= "reservations-global" ":" BOOLEAN
reservations_in_subnet ::= "reservations-in-subnet" ":" BOOLEAN
@@ -589,6 +588,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| reservations_out_of_pool
| client_class
| require_client_classes
+ | evaluate_additional_classes
| preferred_lifetime
| min_preferred_lifetime
| max_preferred_lifetime
@@ -700,6 +700,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| option_data_never_send
| user_context
| comment
+ | option_data_client_classes
| unknown_map_entry
option_data_name ::= name
@@ -716,6 +717,8 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
option_data_never_send ::= "never-send" ":" BOOLEAN
+ option_data_client_classes ::= "client-classes" ":" list_strings
+
pools_list ::= "pools" ":" "[" pools_list_content "]"
pools_list_content ::=
@@ -738,6 +741,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| option_data_list
| client_class
| require_client_classes
+ | evaluate_additional_classes
| user_context
| comment
| unknown_map_entry
@@ -774,6 +778,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| option_data_list
| client_class
| require_client_classes
+ | evaluate_additional_classes
| excluded_prefix
| excluded_prefix_len
| user_context
@@ -862,6 +867,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| client_class_test
| client_class_template_test
| only_if_required
+ | only_in_additional_list
| option_data_list
| user_context
| comment
@@ -881,6 +887,8 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
only_if_required ::= "only-if-required" ":" BOOLEAN
+ only_in_additional_list ::= "only-in-additional-list" ":" BOOLEAN
+
server_id ::= "server-id" ":" "{" server_id_params "}"
server_id_params ::= server_id_param
diff --git a/doc/sphinx/kea-messages.rst b/doc/sphinx/kea-messages.rst
index fd14d4e15b..12b49cfd61 100644
--- a/doc/sphinx/kea-messages.rst
+++ b/doc/sphinx/kea-messages.rst
@@ -3623,6 +3623,52 @@ cached version.
DHCP4
*****
+DHCP4_ADDITIONAL_CLASS_EVAL_ERROR
+=================================
+
+.. code-block:: text
+
+ %1: Expression '%2' evaluated to %3
+
+This error message indicates that a problem was encountered while
+evaluating the expression of an additional client class.
+A description of the problem is printed.
+
+DHCP4_ADDITIONAL_CLASS_EVAL_RESULT
+==================================
+
+.. code-block:: text
+
+ %1: Expression '%2' evaluated to %3
+
+Logged at debug log level 50.
+This debug message indicates that the expression of an additional client class has
+been successfully evaluated. The client class name and the result value of the
+evaluation are printed.
+
+DHCP4_ADDITIONAL_CLASS_NO_TEST
+==============================
+
+.. code-block:: text
+
+ additional class %1 has no test expression, adding it to client's classes unconditionally
+
+Logged at debug log level 40.
+This debug message informs that a class was listed for additional evaluation but
+its definition does not include a test expression to evaluate. The class is
+unconditionally added to the query.
+
+DHCP4_ADDITIONAL_CLASS_UNDEFINED
+================================
+
+.. code-block:: text
+
+ additional class %1 has no definition
+
+Logged at debug log level 40.
+This debug message informs that a class is listed for additional evaluation but
+has no definition. The class is ignored.
+
DHCP4_ALREADY_RUNNING
=====================
@@ -5506,52 +5552,6 @@ about the address that the client would like to have allocated.
If there is no hint, the argument should provide the text indicating
that the hint hasn't been sent.
-DHCP4_REQUIRED_CLASS_EVAL_ERROR
-===============================
-
-.. code-block:: text
-
- %1: Expression '%2' evaluated to %3
-
-This error message indicates that there a problem was encountered while
-evaluating an expression of a required client class that was marked as required.
-A description of the problem is printed.
-
-DHCP4_REQUIRED_CLASS_EVAL_RESULT
-================================
-
-.. code-block:: text
-
- %1: Expression '%2' evaluated to %3
-
-Logged at debug log level 50.
-This debug message indicates that the expression of a required client class has
-been successfully evaluated. The client class name and the result value of the
-evaluation are printed.
-
-DHCP4_REQUIRED_CLASS_NO_TEST
-============================
-
-.. code-block:: text
-
- required class %1 has no test expression, adding it to client's classes unconditionally
-
-Logged at debug log level 40.
-This debug message informs that a class was listed for required evaluation but
-its definition does not include a test expression to evaluate. The class is
-unconditionally added to the query.
-
-DHCP4_REQUIRED_CLASS_UNDEFINED
-==============================
-
-.. code-block:: text
-
- required class %1 has no definition
-
-Logged at debug log level 40.
-This debug message informs that a class is listed for required evaluation but
-has no definition. The class is ignored.
-
DHCP4_RESERVATIONS_LOOKUP_FIRST_ENABLED
=======================================
@@ -5900,6 +5900,52 @@ expected: the erroneous response is dropped, the request query is displayed.
DHCP6
*****
+DHCP6_ADDITIONAL_CLASS_EVAL_ERROR
+=================================
+
+.. code-block:: text
+
+ %1: Expression '%2' evaluated to %3
+
+This error message indicates that a problem was encountered while
+evaluating the expression of an additional client class.
+A description of the problem is printed.
+
+DHCP6_ADDITIONAL_CLASS_EVAL_RESULT
+==================================
+
+.. code-block:: text
+
+ %1: Expression '%2' evaluated to %3
+
+Logged at debug log level 50.
+This debug message indicates that the expression of an additional client class has
+been successfully evaluated. The client class name and the result value of the
+evaluation are printed.
+
+DHCP6_ADDITIONAL_CLASS_NO_TEST
+==============================
+
+.. code-block:: text
+
+ additional class %1 has no test expression, adding it to client's classes unconditionally
+
+Logged at debug log level 40.
+This debug message informs that a class was listed for additional evaluation but
+its definition does not include a test expression to evaluate. The class is
+unconditionally added to the query.
+
+DHCP6_ADDITIONAL_CLASS_UNDEFINED
+================================
+
+.. code-block:: text
+
+ additional class %1 has no definition
+
+Logged at debug log level 40.
+This debug message informs that a class is listed for additional evaluation but
+has no definition. The class is ignored.
+
DHCP6_ADD_GLOBAL_STATUS_CODE
============================
@@ -7790,52 +7836,6 @@ client and transaction identification information. The second and third
argument identify the prefix. The fourth and fifth argument hold the
expected IAID and IAID found respectively.
-DHCP6_REQUIRED_CLASS_EVAL_ERROR
-===============================
-
-.. code-block:: text
-
- %1: Expression '%2' evaluated to %3
-
-This error message indicates that there a problem was encountered while
-evaluating an expression of a required client class that was marked as required.
-A description of the problem is printed.
-
-DHCP6_REQUIRED_CLASS_EVAL_RESULT
-================================
-
-.. code-block:: text
-
- %1: Expression '%2' evaluated to %3
-
-Logged at debug log level 50.
-This debug message indicates that the expression of a required client class has
-been successfully evaluated. The client class name and the result value of the
-evaluation are printed.
-
-DHCP6_REQUIRED_CLASS_NO_TEST
-============================
-
-.. code-block:: text
-
- required class %1 has no test expression, adding it to client's classes unconditionally
-
-Logged at debug log level 40.
-This debug message informs that a class was listed for required evaluation but
-its definition does not include a test expression to evaluate. The class is
-unconditionally added to the query.
-
-DHCP6_REQUIRED_CLASS_UNDEFINED
-==============================
-
-.. code-block:: text
-
- required class %1 has no definition
-
-Logged at debug log level 40.
-This debug message informs that a class is listed for required evaluation but
-has no definition. The class is ignored.
-
DHCP6_REQUIRED_OPTIONS_CHECK_FAIL
=================================
@@ -8648,7 +8648,7 @@ DHCPSRV_EVAL_ERROR
%1: Expression '%2' evaluated to %3
-This error message indicates that there a problem was encountered while
+This error message indicates that a problem was encountered while
evaluating an expression of a client class.
A description of the problem is printed.
@@ -9669,6 +9669,18 @@ This warning message is issued when the current server configuration specifies
no interfaces that the server should listen on, or when the specified interfaces are not
configured to receive the traffic.
+DHCPSRV_ONLY_IF_REQUIRED_DEPRECATED
+===================================
+
+.. code-block:: text
+
+ The parameter 'only-if-required' is deprecated. Use 'only-in-additional-list' instead
+
+This warning message is emitted when configuration parsing detects
+the use of the deprecated 'only-if-required' parameter. It has
+been replaced by 'only-in-additional-list'. Users should migrate
+to the new parameter.
+
DHCPSRV_OPEN_SOCKET_FAIL
========================
@@ -9720,6 +9732,18 @@ reverse update is disabled for this lease or the DNS updates are disabled
in the configuration. The first argument includes the client identification
information. The second argument includes the leased address.
+DHCPSRV_REQUIRE_CLIENT_CLASSES_DEPRECATED
+=========================================
+
+.. code-block:: text
+
+ The parameter 'require-client-classes' is deprecated. Use 'evaluate-additional-classes' instead
+
+This warning message is emitted when configuration parsing detects
+the use of the deprecated 'require-client-classes' parameter. It has
+been replaced by 'evaluate-additional-classes'. Users should migrate
+to the new parameter.
+
DHCPSRV_SUBNET4O6_SELECT_FAILED
===============================
@@ -9837,7 +9861,7 @@ DHCPSRV_TEMPLATE_EVAL_ERROR
%1: Expression '%2' evaluated to %3
-This error message indicates that there a problem was encountered while
+This error message indicates that a problem was encountered while
evaluating an expression of a template client class.
A description of the problem is printed.
diff --git a/doc/sphinx/umls.rst b/doc/sphinx/umls.rst
index c31bcb4cf0..0fb695255e 100644
--- a/doc/sphinx/umls.rst
+++ b/doc/sphinx/umls.rst
@@ -1,5 +1,5 @@
..
- Copyright (C) 2020-2023 Internet Systems Consortium, Inc. ("ISC")
+ Copyright (C) 2020-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/agent/parser_context.cc b/src/bin/agent/parser_context.cc
index 675fda3db6..d8b28bb8fc 100644
--- a/src/bin/agent/parser_context.cc
+++ b/src/bin/agent/parser_context.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2021 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/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index f0a88b70b1..3b572a9ef5 100644
--- 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
@@ -2265,7 +2265,7 @@ using namespace isc::dhcp;
/* To avoid the call to exit... oops! */
#define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg)
-#line 2269 "dhcp4_lexer.cc"
+#line 2268 "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
@@ -2291,8 +2291,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 2294 "dhcp4_lexer.cc"
#line 2295 "dhcp4_lexer.cc"
-#line 2296 "dhcp4_lexer.cc"
#define INITIAL 0
#define COMMENT 1
@@ -2620,7 +2620,7 @@ YY_DECL
}
-#line 2624 "dhcp4_lexer.cc"
+#line 2623 "dhcp4_lexer.cc"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -5788,7 +5788,7 @@ YY_RULE_SETUP
#line 2504 "dhcp4_lexer.ll"
ECHO;
YY_BREAK
-#line 5792 "dhcp4_lexer.cc"
+#line 5791 "dhcp4_lexer.cc"
case YY_END_OF_BUFFER:
{
diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 15f8b417f8..08aa14a56c 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -6,6 +6,28 @@
$NAMESPACE isc::dhcp
+% DHCP4_ADDITIONAL_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
+This error message indicates that a problem was encountered while
+evaluating the expression of an additional client class.
+A description of the problem is printed.
+
+% DHCP4_ADDITIONAL_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
+Logged at debug log level 50.
+This debug message indicates that the expression of an additional client class has
+been successfully evaluated. The client class name and the result value of the
+evaluation are printed.
+
+% DHCP4_ADDITIONAL_CLASS_NO_TEST additional class %1 has no test expression, adding it to client's classes unconditionally
+Logged at debug log level 40.
+This debug message informs that a class was listed for additional evaluation but
+its definition does not include a test expression to evaluate. The class is
+unconditionally added to the query.
+
+% DHCP4_ADDITIONAL_CLASS_UNDEFINED additional class %1 has no definition
+Logged at debug log level 40.
+This debug message informs that a class is listed for additional evaluation but
+has no definition. The class is ignored.
+
% DHCP4_ALREADY_RUNNING %1 already running? %2
This is an error message that occurs when the DHCPv4 server encounters
a pre-existing PID file which contains the PID of a running process.
@@ -968,28 +990,6 @@ about the address that the client would like to have allocated.
If there is no hint, the argument should provide the text indicating
that the hint hasn't been sent.
-% DHCP4_ADDITIONAL_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
-This error message indicates that a problem was encountered while
-evaluating the expression of an additional client class.
-A description of the problem is printed.
-
-% DHCP4_ADDITIONAL_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
-Logged at debug log level 50.
-This debug message indicates that the expression of an additional client class has
-been successfully evaluated. The client class name and the result value of the
-evaluation are printed.
-
-% DHCP4_ADDITIONAL_CLASS_NO_TEST additional class %1 has no test expression, adding it to client's classes unconditionally
-Logged at debug log level 40.
-This debug message informs that a class was listed for additional evaluation but
-its definition does not include a test expression to evaluate. The class is
-unconditionally added to the query.
-
-% DHCP4_ADDITIONAL_CLASS_UNDEFINED additional class %1 has no definition
-Logged at debug log level 40.
-This debug message informs that a class is listed for additional evaluation but
-has no definition. The class is ignored.
-
% DHCP4_RESERVATIONS_LOOKUP_FIRST_ENABLED Multi-threading is enabled and host reservations lookup is always performed first.
This is a message informing that host reservations lookup is performed before
lease lookup when multi-threading is enabled overwriting configured value.
diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index 7538b78f55..af577ab710 100644
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-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/decline_unittest.cc b/src/bin/dhcp4/tests/decline_unittest.cc
index 813a64f268..2a3209b8bb 100644
--- a/src/bin/dhcp4/tests/decline_unittest.cc
+++ b/src/bin/dhcp4/tests/decline_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/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc
index 9c95b2ff69..c7229ace04 100644
--- 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
@@ -2240,7 +2240,7 @@ using namespace isc::dhcp;
/* To avoid the call to exit... oops! */
#define YY_FATAL_ERROR(msg) isc::dhcp::Parser6Context::fatal(msg)
-#line 2244 "dhcp6_lexer.cc"
+#line 2243 "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
@@ -2266,8 +2266,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 2269 "dhcp6_lexer.cc"
#line 2270 "dhcp6_lexer.cc"
-#line 2271 "dhcp6_lexer.cc"
#define INITIAL 0
#define COMMENT 1
@@ -2597,7 +2597,7 @@ YY_DECL
}
-#line 2601 "dhcp6_lexer.cc"
+#line 2600 "dhcp6_lexer.cc"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -5804,7 +5804,7 @@ YY_RULE_SETUP
#line 2536 "dhcp6_lexer.ll"
ECHO;
YY_BREAK
-#line 5808 "dhcp6_lexer.cc"
+#line 5807 "dhcp6_lexer.cc"
case YY_END_OF_BUFFER:
{
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 0dedfbc3b0..37205de87f 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -15,6 +15,28 @@ kea-dhcp4 is using hook libraries (e.g. radius) that implement the
"subnet6_select" callout and client queries are arriving faster than
those callouts can fulfill them.
+% DHCP6_ADDITIONAL_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
+This error message indicates that a problem was encountered while
+evaluating the expression of an additional client class.
+A description of the problem is printed.
+
+% DHCP6_ADDITIONAL_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
+Logged at debug log level 50.
+This debug message indicates that the expression of an additional client class has
+been successfully evaluated. The client class name and the result value of the
+evaluation are printed.
+
+% DHCP6_ADDITIONAL_CLASS_NO_TEST additional class %1 has no test expression, adding it to client's classes unconditionally
+Logged at debug log level 40.
+This debug message informs that a class was listed for additional evaluation but
+its definition does not include a test expression to evaluate. The class is
+unconditionally added to the query.
+
+% DHCP6_ADDITIONAL_CLASS_UNDEFINED additional class %1 has no definition
+Logged at debug log level 40.
+This debug message informs that a class is listed for additional evaluation but
+has no definition. The class is ignored.
+
% DHCP6_ADD_GLOBAL_STATUS_CODE %1: adding Status Code to DHCPv6 packet: %2
Logged at debug log level 50.
This message is logged when the server is adding the top-level
@@ -973,28 +995,6 @@ client and transaction identification information. The second and third
argument identify the prefix. The fourth and fifth argument hold the
expected IAID and IAID found respectively.
-% DHCP6_ADDITIONAL_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
-This error message indicates that a problem was encountered while
-evaluating the expression of an additional client class.
-A description of the problem is printed.
-
-% DHCP6_ADDITIONAL_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
-Logged at debug log level 50.
-This debug message indicates that the expression of an additional client class has
-been successfully evaluated. The client class name and the result value of the
-evaluation are printed.
-
-% DHCP6_ADDITIONAL_CLASS_NO_TEST additional class %1 has no test expression, adding it to client's classes unconditionally
-Logged at debug log level 40.
-This debug message informs that a class was listed for additional evaluation but
-its definition does not include a test expression to evaluate. The class is
-unconditionally added to the query.
-
-% DHCP6_ADDITIONAL_CLASS_UNDEFINED additional class %1 has no definition
-Logged at debug log level 40.
-This debug message informs that a class is listed for additional evaluation but
-has no definition. The class is ignored.
-
% DHCP6_REQUIRED_OPTIONS_CHECK_FAIL %1: %2 message received from %3 failed the following check: %4
Logged at debug log level 40.
This message indicates that received DHCPv6 packet is invalid. This may be due
diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc
index c2402ccec7..15529c9e60 100644
--- a/src/bin/dhcp6/main.cc
+++ b/src/bin/dhcp6/main.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-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/decline_unittest.cc b/src/bin/dhcp6/tests/decline_unittest.cc
index 17e1b19b05..5ae8035e47 100644
--- a/src/bin/dhcp6/tests/decline_unittest.cc
+++ b/src/bin/dhcp6/tests/decline_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/netconf/parser_context.cc b/src/bin/netconf/parser_context.cc
index 3e57c51e9f..c9ec050df0 100644
--- a/src/bin/netconf/parser_context.cc
+++ b/src/bin/netconf/parser_context.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/mysql/mysql_cb_dhcp4.h b/src/hooks/dhcp/mysql/mysql_cb_dhcp4.h
index c55504d468..782b367150 100644
--- a/src/hooks/dhcp/mysql/mysql_cb_dhcp4.h
+++ b/src/hooks/dhcp/mysql/mysql_cb_dhcp4.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/mysql/mysql_cb_dhcp6.h b/src/hooks/dhcp/mysql/mysql_cb_dhcp6.h
index 0653997a77..22b9f615a7 100644
--- a/src/hooks/dhcp/mysql/mysql_cb_dhcp6.h
+++ b/src/hooks/dhcp/mysql/mysql_cb_dhcp6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/mysql_cb_log.cc b/src/hooks/dhcp/mysql/mysql_cb_log.cc
index 1177720d97..d86cb57041 100644
--- a/src/hooks/dhcp/mysql/mysql_cb_log.cc
+++ b/src/hooks/dhcp/mysql/mysql_cb_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/mysql_cb_log.h b/src/hooks/dhcp/mysql/mysql_cb_log.h
index 024f30d0b9..82f4b3639c 100644
--- a/src/hooks/dhcp/mysql/mysql_cb_log.h
+++ b/src/hooks/dhcp/mysql/mysql_cb_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/mysql_hb_log.cc b/src/hooks/dhcp/mysql/mysql_hb_log.cc
index 8cca192ce1..0572cb83ec 100644
--- a/src/hooks/dhcp/mysql/mysql_hb_log.cc
+++ b/src/hooks/dhcp/mysql/mysql_hb_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/mysql_hb_log.h b/src/hooks/dhcp/mysql/mysql_hb_log.h
index 83f2be01bc..ccbf8e58ba 100644
--- a/src/hooks/dhcp/mysql/mysql_hb_log.h
+++ b/src/hooks/dhcp/mysql/mysql_hb_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/mysql_hb_messages.mes b/src/hooks/dhcp/mysql/mysql_hb_messages.mes
index 7b9552c19f..affdacb785 100644
--- a/src/hooks/dhcp/mysql/mysql_hb_messages.mes
+++ b/src/hooks/dhcp/mysql/mysql_hb_messages.mes
@@ -43,4 +43,3 @@ TLS is not used.
Logged at debug log level 40.
A debug message issued when a new MySQL connected is created with TLS.
The TLS cipher name is logged.
-
diff --git a/src/hooks/dhcp/mysql/mysql_lb_log.cc b/src/hooks/dhcp/mysql/mysql_lb_log.cc
index 2177df4fcd..dbf7a35172 100644
--- a/src/hooks/dhcp/mysql/mysql_lb_log.cc
+++ b/src/hooks/dhcp/mysql/mysql_lb_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/mysql_lb_log.h b/src/hooks/dhcp/mysql/mysql_lb_log.h
index 7e6a49d460..868add3d53 100644
--- a/src/hooks/dhcp/mysql/mysql_lb_log.h
+++ b/src/hooks/dhcp/mysql/mysql_lb_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/mysql_lb_messages.mes b/src/hooks/dhcp/mysql/mysql_lb_messages.mes
index 00b804b9b6..f6a3873f20 100644
--- a/src/hooks/dhcp/mysql/mysql_lb_messages.mes
+++ b/src/hooks/dhcp/mysql/mysql_lb_messages.mes
@@ -6,12 +6,6 @@
$NAMESPACE isc::dhcp
-% MYSQL_LB_DB opening MySQL lease database: %1
-This informational message is logged when a DHCP server (either V4 or
-V6) is about to open a MySQL lease database. The parameters of the
-connection including database name and username needed to access it
-(but not the password if any) are logged.
-
% MYSQL_DEINIT_OK unloading MySQL hooks library successful
This informational message indicates that the MySQL Backend hooks
library has been unloaded successfully.
@@ -36,6 +30,24 @@ The code has issued a commit call. All outstanding transactions will be
committed to the database. Note that depending on the MySQL settings,
the commit may not include a write to disk.
+% MYSQL_LB_DB opening MySQL lease database: %1
+This informational message is logged when a DHCP server (either V4 or
+V6) is about to open a MySQL lease database. The parameters of the
+connection including database name and username needed to access it
+(but not the password if any) are logged.
+
+% MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1
+An error message issued when an attempt to reconnect has failed.
+
+% MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds
+An info message issued when the server is scheduling the next attempt to reconnect
+to the database. This occurs when the server has lost database connectivity and
+is attempting to reconnect automatically.
+
+% MYSQL_LB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success
+An error message issued when the server failed to reconnect. Loss of connectivity
+is typically a network or database server issue.
+
% MYSQL_LB_DELETED_EXPIRED_RECLAIMED deleted %1 reclaimed leases from the database
Logged at debug log level 50.
A debug message issued when the server has removed a number of reclaimed
@@ -204,18 +216,6 @@ Logged at debug log level 50.
A debug message issued when the server is about to obtain schema version
information from the MySQL database.
-% MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1
-An error message issued when an attempt to reconnect has failed.
-
-% MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds
-An info message issued when the server is scheduling the next attempt to reconnect
-to the database. This occurs when the server has lost database connectivity and
-is attempting to reconnect automatically.
-
-% MYSQL_LB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success
-An error message issued when the server failed to reconnect. Loss of connectivity
-is typically a network or database server issue.
-
% MYSQL_LB_NEGATIVE_LEASES_STAT recount of leases returned a negative value
This warning message is issued when the recount of leases using counters
in the MySQL database returned a negative value. This shows a problem
@@ -277,4 +277,3 @@ Logged at debug log level 50.
A debug message issued when the server upgrades IPv6 lease extended info.
The page number and started address, and the count of already updated leases
are displayed.
-
diff --git a/src/hooks/dhcp/mysql/mysql_query_macros_dhcp.h b/src/hooks/dhcp/mysql/mysql_query_macros_dhcp.h
index 11dd9c0c6d..bfdd98579d 100644
--- a/src/hooks/dhcp/mysql/mysql_query_macros_dhcp.h
+++ b/src/hooks/dhcp/mysql/mysql_query_macros_dhcp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/mysql/tests/mysql_cb_dhcp4_mgr_unittest.cc b/src/hooks/dhcp/mysql/tests/mysql_cb_dhcp4_mgr_unittest.cc
index fe94b556bc..28107d0358 100644
--- a/src/hooks/dhcp/mysql/tests/mysql_cb_dhcp4_mgr_unittest.cc
+++ b/src/hooks/dhcp/mysql/tests/mysql_cb_dhcp4_mgr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/mysql/tests/mysql_cb_dhcp6_mgr_unittest.cc b/src/hooks/dhcp/mysql/tests/mysql_cb_dhcp6_mgr_unittest.cc
index fe1252f21c..f0e39b0564 100644
--- a/src/hooks/dhcp/mysql/tests/mysql_cb_dhcp6_mgr_unittest.cc
+++ b/src/hooks/dhcp/mysql/tests/mysql_cb_dhcp6_mgr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/mysql/tests/mysql_cb_impl_unittest.cc b/src/hooks/dhcp/mysql/tests/mysql_cb_impl_unittest.cc
index b25f04793a..b1ff472b0f 100644
--- a/src/hooks/dhcp/mysql/tests/mysql_cb_impl_unittest.cc
+++ b/src/hooks/dhcp/mysql/tests/mysql_cb_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/pgsql/pgsql_cb_dhcp4.h b/src/hooks/dhcp/pgsql/pgsql_cb_dhcp4.h
index 8e3e3e4eb2..7e0104604a 100644
--- a/src/hooks/dhcp/pgsql/pgsql_cb_dhcp4.h
+++ b/src/hooks/dhcp/pgsql/pgsql_cb_dhcp4.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-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/pgsql/pgsql_cb_dhcp6.h b/src/hooks/dhcp/pgsql/pgsql_cb_dhcp6.h
index 9f78faca73..056d722bfb 100644
--- a/src/hooks/dhcp/pgsql/pgsql_cb_dhcp6.h
+++ b/src/hooks/dhcp/pgsql/pgsql_cb_dhcp6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-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/pgsql/pgsql_cb_log.cc b/src/hooks/dhcp/pgsql/pgsql_cb_log.cc
index 64522d9b25..24bdfc6c63 100644
--- a/src/hooks/dhcp/pgsql/pgsql_cb_log.cc
+++ b/src/hooks/dhcp/pgsql/pgsql_cb_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-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/pgsql/pgsql_cb_log.h b/src/hooks/dhcp/pgsql/pgsql_cb_log.h
index c2db08535e..d468b3acba 100644
--- a/src/hooks/dhcp/pgsql/pgsql_cb_log.h
+++ b/src/hooks/dhcp/pgsql/pgsql_cb_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-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/pgsql/pgsql_hb_log.cc b/src/hooks/dhcp/pgsql/pgsql_hb_log.cc
index a75061cbcd..54522a5258 100644
--- a/src/hooks/dhcp/pgsql/pgsql_hb_log.cc
+++ b/src/hooks/dhcp/pgsql/pgsql_hb_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/pgsql/pgsql_hb_log.h b/src/hooks/dhcp/pgsql/pgsql_hb_log.h
index 007cc274ef..2d993ee8bd 100644
--- a/src/hooks/dhcp/pgsql/pgsql_hb_log.h
+++ b/src/hooks/dhcp/pgsql/pgsql_hb_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/pgsql/pgsql_hb_messages.mes b/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
index b3e21991a7..e9ac3d75d3 100644
--- a/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
+++ b/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
@@ -45,4 +45,3 @@ This informational message is printed when TLS support was required in
the Kea configuration: The TLS support in PostgreSQL will be initialized but
its configuration is fully managed outside the C API.
The parameters of the connection are logged.
-
diff --git a/src/hooks/dhcp/pgsql/pgsql_lb_log.cc b/src/hooks/dhcp/pgsql/pgsql_lb_log.cc
index ae3c022d60..02d9f9839f 100644
--- a/src/hooks/dhcp/pgsql/pgsql_lb_log.cc
+++ b/src/hooks/dhcp/pgsql/pgsql_lb_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/pgsql/pgsql_lb_log.h b/src/hooks/dhcp/pgsql/pgsql_lb_log.h
index faf8ce3585..fe0d49e6f0 100644
--- a/src/hooks/dhcp/pgsql/pgsql_lb_log.h
+++ b/src/hooks/dhcp/pgsql/pgsql_lb_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/pgsql/pgsql_lb_messages.mes b/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes
index 54037c0f14..fd97bf14b5 100644
--- a/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes
+++ b/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes
@@ -6,12 +6,6 @@
$NAMESPACE isc::dhcp
-% PGSQL_LB_DB opening PostgreSQL lease database: %1
-This informational message is logged when a DHCP server (either V4 or
-V6) is about to open a PostgreSQL lease database. The parameters of the
-connection including database name and username needed to access it
-(but not the password if any) are logged.
-
% PGSQL_DEINIT_OK unloading PostgreSQL hooks library successful
This informational message indicates that the PostgreSQL Backend hooks
library has been unloaded successfully.
@@ -36,6 +30,24 @@ The code has issued a commit call. All outstanding transactions will be
committed to the database. Note that depending on the PostgreSQL settings,
the commit may not include a write to disk.
+% PGSQL_LB_DB opening PostgreSQL lease database: %1
+This informational message is logged when a DHCP server (either V4 or
+V6) is about to open a PostgreSQL lease database. The parameters of the
+connection including database name and username needed to access it
+(but not the password if any) are logged.
+
+% PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1
+An error message issued when an attempt to reconnect has failed.
+
+% PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds
+An info message issued when the server is scheduling the next attempt to reconnect
+to the database. This occurs when the server has lost database connectivity and
+is attempting to reconnect automatically.
+
+% PGSQL_LB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success
+An error message issued when the server failed to reconnect. Loss of connectivity
+is typically a network or database server issue.
+
% PGSQL_LB_DELETE_ADDR4 deleting lease for address %1
Logged at debug log level 50.
A debug message issued when the server is attempting to delete a lease for
@@ -198,18 +210,6 @@ Logged at debug log level 50.
A debug message issued when the server is about to obtain schema version
information from the PostgreSQL database.
-% PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1
-An error message issued when an attempt to reconnect has failed.
-
-% PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds
-An info message issued when the server is scheduling the next attempt to reconnect
-to the database. This occurs when the server has lost database connectivity and
-is attempting to reconnect automatically.
-
-% PGSQL_LB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success
-An error message issued when the server failed to reconnect. Loss of connectivity
-is typically a network or database server issue.
-
% PGSQL_LB_NEGATIVE_LEASES_STAT recount of leases returned a negative value
This warning message is issued when the recount of leases using counters
in the PostgreSQL database returned a negative value. This shows a problem
@@ -273,4 +273,3 @@ Logged at debug log level 50.
A debug message issued when the server upgrades IPv6 lease extended info.
The page number and started address, and the count of already updated leases
are displayed.
-
diff --git a/src/hooks/dhcp/pgsql/pgsql_query_macros_dhcp.h b/src/hooks/dhcp/pgsql/pgsql_query_macros_dhcp.h
index 138addee3f..429fca0f1e 100644
--- a/src/hooks/dhcp/pgsql/pgsql_query_macros_dhcp.h
+++ b/src/hooks/dhcp/pgsql/pgsql_query_macros_dhcp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-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/pgsql/tests/pgsql_cb_dhcp4_mgr_unittest.cc b/src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp4_mgr_unittest.cc
index 5eb0df5743..07ef63c45f 100644
--- a/src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp4_mgr_unittest.cc
+++ b/src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp4_mgr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-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/pgsql/tests/pgsql_cb_dhcp6_mgr_unittest.cc b/src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp6_mgr_unittest.cc
index cb2b699b1e..4e73fd48c7 100644
--- a/src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp6_mgr_unittest.cc
+++ b/src/hooks/dhcp/pgsql/tests/pgsql_cb_dhcp6_mgr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-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/pgsql/tests/pgsql_cb_impl_unittest.cc b/src/hooks/dhcp/pgsql/tests/pgsql_cb_impl_unittest.cc
index 6e1d12e204..d5e6ad7e0d 100644
--- a/src/hooks/dhcp/pgsql/tests/pgsql_cb_impl_unittest.cc
+++ b/src/hooks/dhcp/pgsql/tests/pgsql_cb_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-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/lib/asiolink/crypto_tls.h b/src/lib/asiolink/crypto_tls.h
index 256c476707..7a8979ea9d 100644
--- a/src/lib/asiolink/crypto_tls.h
+++ b/src/lib/asiolink/crypto_tls.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-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/lib/cc/tests/data_unittests.cc b/src/lib/cc/tests/data_unittests.cc
index 2d69dc52cc..ac0ad4eb6f 100644
--- a/src/lib/cc/tests/data_unittests.cc
+++ b/src/lib/cc/tests/data_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2009-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/lib/config_backend/base_config_backend_mgr.h b/src/lib/config_backend/base_config_backend_mgr.h
index 8fc6cfc21d..bc13bbec75 100644
--- a/src/lib/config_backend/base_config_backend_mgr.h
+++ b/src/lib/config_backend/base_config_backend_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/lib/config_backend/constants.h b/src/lib/config_backend/constants.h
index 1378d54fc0..8a8d6ca520 100644
--- a/src/lib/config_backend/constants.h
+++ b/src/lib/config_backend/constants.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/lib/dhcp/classify.h b/src/lib/dhcp/classify.h
index 91e42da980..d617952690 100644
--- a/src/lib/dhcp/classify.h
+++ b/src/lib/dhcp/classify.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2022 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/lib/dhcp/packet_queue_mgr4.h b/src/lib/dhcp/packet_queue_mgr4.h
index 181671b63e..4c353b5f0f 100644
--- a/src/lib/dhcp/packet_queue_mgr4.h
+++ b/src/lib/dhcp/packet_queue_mgr4.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/lib/dhcp/packet_queue_mgr6.h b/src/lib/dhcp/packet_queue_mgr6.h
index b2fff345e1..e86b3deda9 100644
--- a/src/lib/dhcp/packet_queue_mgr6.h
+++ b/src/lib/dhcp/packet_queue_mgr6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/lib/dhcpsrv/config_backend_dhcp4_mgr.h b/src/lib/dhcpsrv/config_backend_dhcp4_mgr.h
index 96671b44f7..53ef4a2288 100644
--- a/src/lib/dhcpsrv/config_backend_dhcp4_mgr.h
+++ b/src/lib/dhcpsrv/config_backend_dhcp4_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-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/lib/dhcpsrv/config_backend_dhcp6_mgr.h b/src/lib/dhcpsrv/config_backend_dhcp6_mgr.h
index 7b99574099..b542d09936 100644
--- a/src/lib/dhcpsrv/config_backend_dhcp6_mgr.h
+++ b/src/lib/dhcpsrv/config_backend_dhcp6_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-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/lib/dhcpsrv/database_backends.dox b/src/lib/dhcpsrv/database_backends.dox
index 860c8e5ccf..6ef66cb9d7 100644
--- a/src/lib/dhcpsrv/database_backends.dox
+++ b/src/lib/dhcpsrv/database_backends.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2022 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/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index e9627632fd..e07a05bf97 100644
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -808,6 +808,12 @@ This warning message is issued when the current server configuration specifies
no interfaces that the server should listen on, or when the specified interfaces are not
configured to receive the traffic.
+% DHCPSRV_ONLY_IF_REQUIRED_DEPRECATED The parameter 'only-if-required' is deprecated. Use 'only-in-additional-list' instead
+This warning message is emitted when configuration parsing detects
+the use of the deprecated 'only-if-required' parameter. It has
+been replaced by 'only-in-additional-list'. Users should migrate
+to the new parameter.
+
% DHCPSRV_OPEN_SOCKET_FAIL failed to open socket: %1
A warning message issued when IfaceMgr fails to open and bind a socket.
The reason for the failure is appended as an argument of the log message.
@@ -835,6 +841,12 @@ reverse update is disabled for this lease or the DNS updates are disabled
in the configuration. The first argument includes the client identification
information. The second argument includes the leased address.
+% DHCPSRV_REQUIRE_CLIENT_CLASSES_DEPRECATED The parameter 'require-client-classes' is deprecated. Use 'evaluate-additional-classes' instead
+This warning message is emitted when configuration parsing detects
+the use of the deprecated 'require-client-classes' parameter. It has
+been replaced by 'evaluate-additional-classes'. Users should migrate
+to the new parameter.
+
% DHCPSRV_SUBNET4O6_SELECT_FAILED Failed to select any subnet for the DHCPv4o6 packet
Logged at debug log level 40.
A debug message issued when the server was unable to select any subnet for the
@@ -945,15 +957,3 @@ included in the message.
% DHCPSRV_UNKNOWN_DB 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.
-
-% DHCPSRV_REQUIRE_CLIENT_CLASSES_DEPRECATED The parameter 'require-client-classes' is deprecated. Use 'evaluate-additional-classes' instead
-This warning message is emitted when configuration parsing detects
-the use of the deprecated 'require-client-classes' parameter. It has
-been replaced by 'evaluate-additional-classes'. Users should migrate
-to the new parameter.
-
-% DHCPSRV_ONLY_IF_REQUIRED_DEPRECATED The parameter 'only-if-required' is deprecated. Use 'only-in-additional-list' instead
-This warning message is emitted when configuration parsing detects
-the use of the deprecated 'only-if-required' parameter. It has
-been replaced by 'only-in-additional-list'. Users should migrate
-to the new parameter.
diff --git a/src/lib/dhcpsrv/ip_range_permutation.h b/src/lib/dhcpsrv/ip_range_permutation.h
index 9bd69e8607..65e59ad399 100644
--- a/src/lib/dhcpsrv/ip_range_permutation.h
+++ b/src/lib/dhcpsrv/ip_range_permutation.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-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/lib/dhcpsrv/libdhcpsrv.dox b/src/lib/dhcpsrv/libdhcpsrv.dox
index 423f1b680e..46f0302894 100644
--- a/src/lib/dhcpsrv/libdhcpsrv.dox
+++ b/src/lib/dhcpsrv/libdhcpsrv.dox
@@ -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/lib/dhcpsrv/pool.h b/src/lib/dhcpsrv/pool.h
index e85c32c9fd..85301790c3 100644
--- a/src/lib/dhcpsrv/pool.h
+++ b/src/lib/dhcpsrv/pool.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/lib/process/tests/log_parser_unittests.cc b/src/lib/process/tests/log_parser_unittests.cc
index 448c471551..a09c4c2fa4 100644
--- a/src/lib/process/tests/log_parser_unittests.cc
+++ b/src/lib/process/tests/log_parser_unittests.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/lib/util/bigints.h b/src/lib/util/bigints.h
index 227a180798..f351304dff 100644
--- a/src/lib/util/bigints.h
+++ b/src/lib/util/bigints.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-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