From 28184c88b4302626b555eeaa7cd7c495a95bfbd4 Mon Sep 17 00:00:00 2001 From: Marcin Godzina Date: Fri, 19 Sep 2025 16:32:46 +0200 Subject: [PATCH] [#4122] release changes --- ChangeLog | 52 +++++++++++++- ...t-return-csv-lease-file-location-when-used | 5 -- ...og-the-pxe-boot-details-sent-to-my-clients | 5 -- .../3860-radius-vendor-attributes | 6 -- ...ent-ip-reservation-inconsistently-assigned | 4 -- ...ile-option-to-high-availability-parameters | 6 -- .../4086-password-leaked-to-logs | 5 -- .../4096-add-drop-stats-service-disabled | 5 -- .../4107-race-condition-in-pid-file-handling | 4 -- doc/devel/congestion-handling.dox | 2 +- doc/sphinx/debug-messages.rst | 1 + doc/sphinx/kea-messages.rst | 69 ++++++++++++------- platforms.rst | 2 +- src/bin/agent/agent_lexer.cc | 12 ++-- src/bin/d2/d2_lexer.cc | 12 ++-- src/bin/dhcp4/dhcp4_lexer.cc | 12 ++-- src/bin/dhcp6/dhcp6_lexer.cc | 12 ++-- src/bin/lfc/lfc_controller.cc | 2 +- src/hooks/dhcp/flex_id/flex_id_messages.mes | 16 ++--- src/hooks/dhcp/perfmon/perfmon_config.h | 2 +- src/hooks/dhcp/stat_cmds/stat_cmds.cc | 2 +- src/lib/asiolink/interval_timer.h | 2 +- src/lib/asiolink/process_spawn.cc | 2 +- src/lib/asiolink/process_spawn.h | 2 +- .../asiolink/tests/process_spawn_unittest.cc | 2 +- src/lib/dhcp/option4_client_fqdn.cc | 2 +- src/lib/dhcp/pkt.h | 2 +- src/lib/dhcp/pkt4.cc | 2 +- src/lib/dhcp/pkt6.h | 2 +- src/lib/dhcp/tests/pkt4_unittest.cc | 2 +- src/lib/dhcpsrv/dhcpsrv_messages.mes | 16 ++--- src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc | 2 +- src/lib/dhcpsrv/tests/lease_mgr_unittest.cc | 2 +- src/lib/eval/lexer.cc | 12 ++-- src/lib/stats/context.cc | 2 +- src/lib/stats/context.h | 2 +- src/lib/stats/stats_mgr.cc | 2 +- src/lib/stats/stats_mgr.h | 2 +- src/lib/stats/tests/stats_mgr_unittest.cc | 2 +- src/lib/util/pid_file.h | 2 +- src/lib/util/str.cc | 2 +- src/lib/util/str.h | 2 +- src/lib/util/tests/pid_file_unittest.cc | 2 +- src/lib/util/tests/str_unittests.cc | 2 +- src/lib/yang/adaptor_option.h | 2 +- 45 files changed, 168 insertions(+), 140 deletions(-) delete mode 100644 changelog_unreleased/2305-status-get-return-csv-lease-file-location-when-used delete mode 100644 changelog_unreleased/3531-how-can-i-log-the-pxe-boot-details-sent-to-my-clients delete mode 100644 changelog_unreleased/3860-radius-vendor-attributes delete mode 100644 changelog_unreleased/4011-kea-dhcp6-client-ip-reservation-inconsistently-assigned delete mode 100644 changelog_unreleased/4070-add-basic-auth-user-file-option-to-high-availability-parameters delete mode 100644 changelog_unreleased/4086-password-leaked-to-logs delete mode 100644 changelog_unreleased/4096-add-drop-stats-service-disabled delete mode 100644 changelog_unreleased/4107-race-condition-in-pid-file-handling diff --git a/ChangeLog b/ChangeLog index abad14a821..99ce29bcf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,53 @@ +Kea 3.1.2 (development) released on September 24, 2025 + +2403. [func] fdupont + Added "pkt4-service-disabled" and "pkt6-service-disabled" + statistics which are increased when an incoming packet + was dropped because the DHCP service is disabled. + (Gitlab #4096) + +2402. [func] fdupont + When Kea is configured to use the memfile lease backend, + the "status-get" command returns the location of the + CVS backup file in the "csv-lease-file" entry. + (Gitlab #2305) + +2401. [sec] tmark + Removed logging of database password as clear + text when kea-dhcp4 or kea-dhcp6 initializes + the schema. + (Gitlab #4086) + +2400. [bug] fdupont + Fixed a race condition in pid file handling (used by + servers, agents and lease file cleanup). + (Gitlab #4107) + +2399. [func] fdupont + Added support of RADIUS dictionary includes, vendor + attributes and integer translations to the RADIUS hook + library for compatibility with previous versions using + the FreeRADIUS client library. + (Gitlab #3860) + +2398. [sec] fdupont + Added the "basic-auth-user-file" parameter to the HA + hook library. This allows the basic HTTP auth user + ID to be read from a file rather than specified as + clear text in the configuration. + (Gitlab #4070) + +2397. [func] tmark + Additional packet details are now emitted in + debug level logs by kea-dhcp4 for both inbound + and outbound packets. + (Gitlab #3531) + +2396. [func] tmark + The flex-id hook library parameter, ``identifier-expression``, + is now optional. Prior to this, it was mandatory. + (Gitlab #4011) + 2395. [build] razvan The library version numbers have been bumped up for the Kea 3.1.2 development release. @@ -22,7 +72,7 @@ file cleanup process is running. (Gitlab #3986) -Kea 3.1.1 (development) released on September 27, 2025 +Kea 3.1.1 (development) released on August 27, 2025 2391. [bug] fdupont When reusing an expired lease, kea-dhcp6 now correctly saves diff --git a/changelog_unreleased/2305-status-get-return-csv-lease-file-location-when-used b/changelog_unreleased/2305-status-get-return-csv-lease-file-location-when-used deleted file mode 100644 index c6117cbfe0..0000000000 --- a/changelog_unreleased/2305-status-get-return-csv-lease-file-location-when-used +++ /dev/null @@ -1,5 +0,0 @@ -[func] fdupont - When Kea is configured to use the memfile lease backend, - the "status-get" command returns the location of the - CVS backup file in the "csv-lease-file" entry. - (Gitlab #2305) diff --git a/changelog_unreleased/3531-how-can-i-log-the-pxe-boot-details-sent-to-my-clients b/changelog_unreleased/3531-how-can-i-log-the-pxe-boot-details-sent-to-my-clients deleted file mode 100644 index 48e7fb79ce..0000000000 --- a/changelog_unreleased/3531-how-can-i-log-the-pxe-boot-details-sent-to-my-clients +++ /dev/null @@ -1,5 +0,0 @@ -[func] tmark - Additional packet details are now emitted in - debug level logs by kea-dhcp4 for both inbound - and outbound packets. - (Gitlab #3531) diff --git a/changelog_unreleased/3860-radius-vendor-attributes b/changelog_unreleased/3860-radius-vendor-attributes deleted file mode 100644 index 5eeb67fcbe..0000000000 --- a/changelog_unreleased/3860-radius-vendor-attributes +++ /dev/null @@ -1,6 +0,0 @@ -[func] fdupont - Added support of RADIUS dictionary includes, vendor - attributes and integer translations to the RADIUS hook - library for compatibility with previous versions using - the FreeRADIUS client library. - (Gitlab #2860) diff --git a/changelog_unreleased/4011-kea-dhcp6-client-ip-reservation-inconsistently-assigned b/changelog_unreleased/4011-kea-dhcp6-client-ip-reservation-inconsistently-assigned deleted file mode 100644 index 445ccef4ff..0000000000 --- a/changelog_unreleased/4011-kea-dhcp6-client-ip-reservation-inconsistently-assigned +++ /dev/null @@ -1,4 +0,0 @@ -[func] tmark - The flex-id hook library parameter, ``identifier-expression``, - is now optional. Prior to this, it was mandatory. - (Gitlab #4011) diff --git a/changelog_unreleased/4070-add-basic-auth-user-file-option-to-high-availability-parameters b/changelog_unreleased/4070-add-basic-auth-user-file-option-to-high-availability-parameters deleted file mode 100644 index 736a9c0c4c..0000000000 --- a/changelog_unreleased/4070-add-basic-auth-user-file-option-to-high-availability-parameters +++ /dev/null @@ -1,6 +0,0 @@ -[sec] fdupont - Added the "basic-auth-user-file" parameter to the HA - hook library. This allows the basic HTTP auth user - ID to be read from a file rather than specified as - clear text in the configuration. - (Gitlab #4070) diff --git a/changelog_unreleased/4086-password-leaked-to-logs b/changelog_unreleased/4086-password-leaked-to-logs deleted file mode 100644 index b015deec3a..0000000000 --- a/changelog_unreleased/4086-password-leaked-to-logs +++ /dev/null @@ -1,5 +0,0 @@ -[sec] tmark - Removed logging of database password as clear - text when kea-dhcp4 or kea-dhcp6 initializes - the schema. - (Gitlab #4086) diff --git a/changelog_unreleased/4096-add-drop-stats-service-disabled b/changelog_unreleased/4096-add-drop-stats-service-disabled deleted file mode 100644 index 8c7ebc68e5..0000000000 --- a/changelog_unreleased/4096-add-drop-stats-service-disabled +++ /dev/null @@ -1,5 +0,0 @@ -[func] fdupont - Added "pkt4-service-disabled" and "pkt6-service-disabled" - statistics which are increased when an incoming packet - was dropped because the DHCP service is disabled. - (Gitlab #4096) diff --git a/changelog_unreleased/4107-race-condition-in-pid-file-handling b/changelog_unreleased/4107-race-condition-in-pid-file-handling deleted file mode 100644 index d13a9d8584..0000000000 --- a/changelog_unreleased/4107-race-condition-in-pid-file-handling +++ /dev/null @@ -1,4 +0,0 @@ -[bug] fdupont - Fixed a race condition in pid file handling (used by - servers, agents and lease file cleanup). - (Gitlab #4107) diff --git a/doc/devel/congestion-handling.dox b/doc/devel/congestion-handling.dox index 1a963fd0cb..0c3ecb8400 100644 --- a/doc/devel/congestion-handling.dox +++ b/doc/devel/congestion-handling.dox @@ -1,4 +1,4 @@ -// Copyright (C) 2018-2023 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 diff --git a/doc/sphinx/debug-messages.rst b/doc/sphinx/debug-messages.rst index c09b538108..0ec6321b2b 100644 --- a/doc/sphinx/debug-messages.rst +++ b/doc/sphinx/debug-messages.rst @@ -280,6 +280,7 @@ Messages printed on debuglevel 40 - FLEX_ID_IGNORE_IAID_APPLIED_ON_PD - FLEX_ID_IGNORE_IAID_NOT_APPLIED_ON_NA - FLEX_ID_IGNORE_IAID_NOT_APPLIED_ON_PD +- FLEX_ID_NO_IDENTIFIER_EXPRESSION - FLEX_ID_RESTORE_CLIENT_ID - FLEX_ID_RESTORE_DUID - FLEX_ID_USED_AS_CLIENT_ID diff --git a/doc/sphinx/kea-messages.rst b/doc/sphinx/kea-messages.rst index 499ae0ed92..c2fd3a29c6 100644 --- a/doc/sphinx/kea-messages.rst +++ b/doc/sphinx/kea-messages.rst @@ -5646,7 +5646,8 @@ DHCP4_QUERY_DATA Logged at debug log level 55. A debug message printing the details of the received packet. The first argument includes the client and the transaction identification -information. +information. Packet fields ciaddr, yiaddr, siaddr, giaddr, sname, and file +will be included when not empty. DHCP4_QUERY_LABEL ================= @@ -5843,7 +5844,8 @@ A debug message including the detailed data about the packet being sent to the client. The first argument contains the client and the transaction identification information. The second and third argument contains the packet name and type respectively. The fourth argument contains detailed -packet information. +packet information. Packet fields ciaddr, yiaddr, siaddr, giaddr, sname, +and file will be included when not empty. DHCP4_RESPONSE_FQDN_DATA ======================== @@ -8718,6 +8720,20 @@ DHCPSRV_CFGMGR_NEW_SUBNET6 This is an informational message reporting that the configuration has been extended to include the specified subnet. +DHCPSRV_CFGMGR_OPTION_DEFINITION_MISMATCH +========================================= + +.. code-block:: text + + failed to create option: %1 + +This warning message is issued when an option has been specified for which +there is no suitable option definition. Either there is no definition at all +or the option contents do not fit the option definition. The argument will +provide a detailed reason for the failure. The server will continue to +operate but it will exclude the option from packet processing until the +situation is corrected. This is considered a configuration error. + DHCPSRV_CFGMGR_OPTION_DUPLICATE =============================== @@ -9972,6 +9988,17 @@ failed to re-open or re-create the lease file after renaming the lease file for lease file cleanup. The server continues to operate but leases do not persist to disk. +DHCPSRV_MEMFILE_LFC_RESCHEDULED +=============================== + +.. code-block:: text + + rescheduled Lease File Cleanup + +An informational message issued when the memfile lease database backend +rescheduled the periodic Lease File Cleanup at the reception of a +"kea-lfc-start" command. + DHCPSRV_MEMFILE_LFC_SETUP ========================= @@ -12254,18 +12281,6 @@ and vendor option was not found. FLEX **** -FLEX_ID_EXPRESSION_EMPTY -======================== - -.. code-block:: text - - Specified identifier-expression is empty - -This warning message is printed when the flex-id library is being loaded, -but the expression used to generate the identifier is empty. The library -will load, but will not generate any identifiers. Please make sure that -the identifier-expression parameter is specified. - FLEX_ID_EXPRESSION_EVALUATED ============================ @@ -12313,18 +12328,6 @@ This error message is printed when the flex-id library is being loaded, but the expression used to generate the identifier is malformed. It has a different JSON type (e.g. is a map) rather than expected string. -FLEX_ID_EXPRESSION_NOT_DEFINED -============================== - -.. code-block:: text - - Expression (identifier-expression) is not defined. - -This warning message is printed when the flex-id library is loaded, but the -expression used to generate the identifier is not specified. The library -will load, but will not generate any identifiers. Please make sure that -the identifier-expression parameter is specified for your library. - FLEX_ID_EXPRESSION_PARSE_FAILED =============================== @@ -12415,6 +12418,20 @@ This error message will be printed when an error is encountered during loading of the library. Details of the problem are printed as parameter to this message. +FLEX_ID_NO_IDENTIFIER_EXPRESSION +================================ + +.. code-block:: text + + identifier-expression is either not specified or empty + +Logged at debug log level 40. +This debug message is printed when the flex-id library is being loaded, +but the expression used to generate the identifier was either omitted or +is empty. The library will load, but will neither generate nor replace +client identifiers. Typically this occurs when users are only interested +in using ignore-iaid, which operates independently of the expression. + FLEX_ID_REPLACE_CLIENT_ID_JSON_TYPE =================================== diff --git a/platforms.rst b/platforms.rst index cfbbd1f436..5ee062eacd 100644 --- a/platforms.rst +++ b/platforms.rst @@ -18,7 +18,7 @@ Kea is officially supported on Alpine, Debian, Fedora, FreeBSD, RHEL, and Ubuntu systems. Kea-|release| builds have been tested on: * Alpine — 3.19, 3.20, 3.21, 3.22 -* Debian — 11, 12 +* Debian — 11, 12, 13 * Fedora — 41, 42 * FreeBSD — 14 * RHEL — 8, 9, 10 diff --git a/src/bin/agent/agent_lexer.cc b/src/bin/agent/agent_lexer.cc index 7d49ac15f0..75f2a9a036 100644 --- a/src/bin/agent/agent_lexer.cc +++ b/src/bin/agent/agent_lexer.cc @@ -1,6 +1,6 @@ -#line 2 "agent_lexer.cc" +#line 1 "agent_lexer.cc" -#line 4 "agent_lexer.cc" +#line 3 "agent_lexer.cc" #define YY_INT_ALIGNED short int @@ -1624,7 +1624,7 @@ using isc::agent::AgentParser; /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::agent::ParserContext::fatal(msg) -#line 1628 "agent_lexer.cc" +#line 1627 "agent_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 @@ -1650,8 +1650,8 @@ using isc::agent::AgentParser; 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 1653 "agent_lexer.cc" #line 1654 "agent_lexer.cc" -#line 1655 "agent_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1965,7 +1965,7 @@ YY_DECL } -#line 1969 "agent_lexer.cc" +#line 1968 "agent_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2982,7 +2982,7 @@ YY_RULE_SETUP #line 835 "agent_lexer.ll" ECHO; YY_BREAK -#line 2986 "agent_lexer.cc" +#line 2985 "agent_lexer.cc" case YY_END_OF_BUFFER: { diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc index 1e56767ffb..92e386daa0 100644 --- a/src/bin/d2/d2_lexer.cc +++ b/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 @@ -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: { diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc index 9d7e68689e..7e602585ad 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 @@ -2311,7 +2311,7 @@ using namespace isc::dhcp; /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg) -#line 2315 "dhcp4_lexer.cc" +#line 2314 "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 @@ -2337,8 +2337,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 2340 "dhcp4_lexer.cc" #line 2341 "dhcp4_lexer.cc" -#line 2342 "dhcp4_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -2666,7 +2666,7 @@ YY_DECL } -#line 2670 "dhcp4_lexer.cc" +#line 2669 "dhcp4_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -6008,7 +6008,7 @@ YY_RULE_SETUP #line 2642 "dhcp4_lexer.ll" ECHO; YY_BREAK -#line 6012 "dhcp4_lexer.cc" +#line 6011 "dhcp4_lexer.cc" case YY_END_OF_BUFFER: { diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc index 9ef7203870..db7809eb03 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 @@ -2284,7 +2284,7 @@ using namespace isc::dhcp; /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::dhcp::Parser6Context::fatal(msg) -#line 2288 "dhcp6_lexer.cc" +#line 2287 "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 @@ -2310,8 +2310,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 2313 "dhcp6_lexer.cc" #line 2314 "dhcp6_lexer.cc" -#line 2315 "dhcp6_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -2641,7 +2641,7 @@ YY_DECL } -#line 2645 "dhcp6_lexer.cc" +#line 2644 "dhcp6_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -6023,7 +6023,7 @@ YY_RULE_SETUP #line 2675 "dhcp6_lexer.ll" ECHO; YY_BREAK -#line 6027 "dhcp6_lexer.cc" +#line 6026 "dhcp6_lexer.cc" case YY_END_OF_BUFFER: { diff --git a/src/bin/lfc/lfc_controller.cc b/src/bin/lfc/lfc_controller.cc index cd651d305b..ebe11b3ceb 100644 --- a/src/bin/lfc/lfc_controller.cc +++ b/src/bin/lfc/lfc_controller.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 diff --git a/src/hooks/dhcp/flex_id/flex_id_messages.mes b/src/hooks/dhcp/flex_id/flex_id_messages.mes index 6585ca0063..e5173be8f6 100644 --- a/src/hooks/dhcp/flex_id/flex_id_messages.mes +++ b/src/hooks/dhcp/flex_id/flex_id_messages.mes @@ -4,14 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -% FLEX_ID_NO_IDENTIFIER_EXPRESSION identifier-expression is either not specified or empty -Logged at debug log level 40. -This debug message is printed when the flex-id library is being loaded, -but the expression used to generate the identifier was either omitted or -is empty. The library will load, but will neither generate nor replace -client identifiers. Typically this occurs when users are only interested -in using ignore-iaid, which operates independently of the expression. - % FLEX_ID_EXPRESSION_EVALUATED Expression evaluated for packet to "%1" (size: %2) Logged at debug log level 40. This debug message is printed every time a packet evaluation is successful. @@ -77,6 +69,14 @@ This error message will be printed when an error is encountered during loading of the library. Details of the problem are printed as parameter to this message. +% FLEX_ID_NO_IDENTIFIER_EXPRESSION identifier-expression is either not specified or empty +Logged at debug log level 40. +This debug message is printed when the flex-id library is being loaded, +but the expression used to generate the identifier was either omitted or +is empty. The library will load, but will neither generate nor replace +client identifiers. Typically this occurs when users are only interested +in using ignore-iaid, which operates independently of the expression. + % FLEX_ID_REPLACE_CLIENT_ID_JSON_TYPE the replace-client-id is %1 but expected boolean value This error message is printed when the flex-id library is being loaded, but the replace-client-id parameter is malformed, i.e. it has a different diff --git a/src/hooks/dhcp/perfmon/perfmon_config.h b/src/hooks/dhcp/perfmon/perfmon_config.h index 33cd18ef96..97cbf62eac 100644 --- a/src/hooks/dhcp/perfmon/perfmon_config.h +++ b/src/hooks/dhcp/perfmon/perfmon_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 diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds.cc b/src/hooks/dhcp/stat_cmds/stat_cmds.cc index 3e9f29f4f0..d4430b863a 100644 --- a/src/hooks/dhcp/stat_cmds/stat_cmds.cc +++ b/src/hooks/dhcp/stat_cmds/stat_cmds.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 diff --git a/src/lib/asiolink/interval_timer.h b/src/lib/asiolink/interval_timer.h index 790d132b42..e7ba4c11a4 100644 --- a/src/lib/asiolink/interval_timer.h +++ b/src/lib/asiolink/interval_timer.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 diff --git a/src/lib/asiolink/process_spawn.cc b/src/lib/asiolink/process_spawn.cc index 10769355c1..0182a5eccb 100644 --- a/src/lib/asiolink/process_spawn.cc +++ b/src/lib/asiolink/process_spawn.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 diff --git a/src/lib/asiolink/process_spawn.h b/src/lib/asiolink/process_spawn.h index aabdaad09d..55b47be4ac 100644 --- a/src/lib/asiolink/process_spawn.h +++ b/src/lib/asiolink/process_spawn.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 diff --git a/src/lib/asiolink/tests/process_spawn_unittest.cc b/src/lib/asiolink/tests/process_spawn_unittest.cc index 365a51bed7..e0d58c1906 100644 --- a/src/lib/asiolink/tests/process_spawn_unittest.cc +++ b/src/lib/asiolink/tests/process_spawn_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 diff --git a/src/lib/dhcp/option4_client_fqdn.cc b/src/lib/dhcp/option4_client_fqdn.cc index 19349dc09a..81edb11417 100644 --- a/src/lib/dhcp/option4_client_fqdn.cc +++ b/src/lib/dhcp/option4_client_fqdn.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 diff --git a/src/lib/dhcp/pkt.h b/src/lib/dhcp/pkt.h index d35666a0f6..ad690d6461 100644 --- a/src/lib/dhcp/pkt.h +++ b/src/lib/dhcp/pkt.h @@ -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 diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc index 131ad8c5a6..aa2ea9428d 100644 --- a/src/lib/dhcp/pkt4.cc +++ b/src/lib/dhcp/pkt4.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 diff --git a/src/lib/dhcp/pkt6.h b/src/lib/dhcp/pkt6.h index 95c15c7d6c..594241ba37 100644 --- a/src/lib/dhcp/pkt6.h +++ b/src/lib/dhcp/pkt6.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 diff --git a/src/lib/dhcp/tests/pkt4_unittest.cc b/src/lib/dhcp/tests/pkt4_unittest.cc index 84f1e81160..72f0da76a7 100644 --- a/src/lib/dhcp/tests/pkt4_unittest.cc +++ b/src/lib/dhcp/tests/pkt4_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 diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index 8bdd6dcfbe..94c56d77f9 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -124,6 +124,14 @@ been extended to include the specified IPv4 subnet. This is an informational message reporting that the configuration has been extended to include the specified subnet. +% DHCPSRV_CFGMGR_OPTION_DEFINITION_MISMATCH failed to create option: %1 +This warning message is issued when an option has been specified for which +there is no suitable option definition. Either there is no definition at all +or the option contents do not fit the option definition. The argument will +provide a detailed reason for the failure. The server will continue to +operate but it will exclude the option from packet processing until the +situation is corrected. This is considered a configuration error. + % DHCPSRV_CFGMGR_OPTION_DUPLICATE multiple options with the code: %1 added to the subnet: %2 This warning message is issued on an attempt to configure multiple options with the same option code for the particular subnet. Adding multiple options is uncommon @@ -1026,11 +1034,3 @@ disabled and the path specified for forensic logging output does not comply with the supported path. The server will still use the specified path but is warning that doing so may pose a security risk. - -% DHCPSRV_CFGMGR_OPTION_DEFINITION_MISMATCH failed to create option: %1 -This warning message is issued when an option has been specified for which -there is no suitable option definition. Either there is no definition at all -or the option contents do not fit the option definition. The argument will -provide a detailed reason for the failure. The server will continue to -operate but it will exclude the option from packet processing until the -situation is corrected. This is considered a configuration error. diff --git a/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc b/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc index 0af6f3806c..dd321baa58 100644 --- a/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc +++ b/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc @@ -1,4 +1,4 @@ -// 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 diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc index 55e4b2684b..2e8475e957 100644 --- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/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 diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc index 6fcdd32c59..729662fa63 100644 --- a/src/lib/eval/lexer.cc +++ b/src/lib/eval/lexer.cc @@ -1,6 +1,6 @@ -#line 2 "lexer.cc" +#line 1 "lexer.cc" -#line 4 "lexer.cc" +#line 3 "lexer.cc" #define YY_INT_ALIGNED short int @@ -1055,7 +1055,7 @@ namespace { /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::eval::EvalContext::fatal(msg) -#line 1059 "lexer.cc" +#line 1058 "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 @@ -1080,8 +1080,8 @@ namespace { by moving it ahead by yyleng bytes. yyleng specifies the length of the currently matched token. */ #define YY_USER_ACTION loc.columns(evalleng); +#line 1083 "lexer.cc" #line 1084 "lexer.cc" -#line 1085 "lexer.cc" #define INITIAL 0 @@ -1380,7 +1380,7 @@ YY_DECL -#line 1384 "lexer.cc" +#line 1383 "lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1889,7 +1889,7 @@ YY_RULE_SETUP #line 251 "lexer.ll" ECHO; YY_BREAK -#line 1893 "lexer.cc" +#line 1892 "lexer.cc" case YY_END_OF_BUFFER: { diff --git a/src/lib/stats/context.cc b/src/lib/stats/context.cc index e28228132a..b2d9946c2d 100644 --- a/src/lib/stats/context.cc +++ b/src/lib/stats/context.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 diff --git a/src/lib/stats/context.h b/src/lib/stats/context.h index b5879974db..b865ca3f78 100644 --- a/src/lib/stats/context.h +++ b/src/lib/stats/context.h @@ -1,4 +1,4 @@ -// Copyright (C) 2015-2020 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 diff --git a/src/lib/stats/stats_mgr.cc b/src/lib/stats/stats_mgr.cc index cbb7b32625..90afd9a51d 100644 --- a/src/lib/stats/stats_mgr.cc +++ b/src/lib/stats/stats_mgr.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 diff --git a/src/lib/stats/stats_mgr.h b/src/lib/stats/stats_mgr.h index 5ddf71537e..1ef1c269d5 100644 --- a/src/lib/stats/stats_mgr.h +++ b/src/lib/stats/stats_mgr.h @@ -1,4 +1,4 @@ -// Copyright (C) 2015-2023 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 diff --git a/src/lib/stats/tests/stats_mgr_unittest.cc b/src/lib/stats/tests/stats_mgr_unittest.cc index 5da3483894..a271234b9e 100644 --- a/src/lib/stats/tests/stats_mgr_unittest.cc +++ b/src/lib/stats/tests/stats_mgr_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2015-2020 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 diff --git a/src/lib/util/pid_file.h b/src/lib/util/pid_file.h index ecf0a368ac..d228ae0ddd 100644 --- a/src/lib/util/pid_file.h +++ b/src/lib/util/pid_file.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 diff --git a/src/lib/util/str.cc b/src/lib/util/str.cc index 142b186ad0..f2c8ebcac7 100644 --- a/src/lib/util/str.cc +++ b/src/lib/util/str.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 diff --git a/src/lib/util/str.h b/src/lib/util/str.h index 0e2a8549eb..8357df8f38 100644 --- a/src/lib/util/str.h +++ b/src/lib/util/str.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 diff --git a/src/lib/util/tests/pid_file_unittest.cc b/src/lib/util/tests/pid_file_unittest.cc index e843e92e1f..09b3bd1adf 100644 --- a/src/lib/util/tests/pid_file_unittest.cc +++ b/src/lib/util/tests/pid_file_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2015-2021 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 diff --git a/src/lib/util/tests/str_unittests.cc b/src/lib/util/tests/str_unittests.cc index 0afcdda8e9..43ce94ce34 100644 --- a/src/lib/util/tests/str_unittests.cc +++ b/src/lib/util/tests/str_unittests.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 diff --git a/src/lib/yang/adaptor_option.h b/src/lib/yang/adaptor_option.h index f9c33274c8..d7c4351a58 100644 --- a/src/lib/yang/adaptor_option.h +++ b/src/lib/yang/adaptor_option.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 -- 2.47.3