[#3492] ChangeLog and cleanup

diff --git a/ChangeLog b/ChangeLog
index 998cfb70ecd94f2cf20a2b3115a8e66f999cdabf..5440820dc3650f5fa8d7dbd6f98bf6d9faee6c76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2269.  [func]          tmark
+       Extended kea-dhcp4 and kea-dhcp6 lenient option parsing
+       to drop options which contain malformed FQDNs such as
+       DHO_V4_LOST_SERVER and D6O_V6_ACCESS_DOMAIN.
+       (Gitlab #3492)
+
 Kea 2.7.1 (development) released on July 31, 2024
 
 2268.  [build]         ravan

diff --git a/src/lib/dhcp/option.h b/src/lib/dhcp/option.h
index 31ccefcbf64771b056263ba5d1fa2a5fb4de7833..8643574d8e0b04738462b2cccb7cb63c4e6e11e4 100644 (file)
--- a/src/lib/dhcp/option.h
+++ b/src/lib/dhcp/option.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2022 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
@@ -70,6 +70,8 @@ public:
         isc::Exception(file, line, what) { };
 };
 
+/// @brief Wrapper exception thrown by unpackOptionsX functions to
+/// add option type and len to the underlying error.
 class OptionParseError : public Exception {
 public:
     OptionParseError (const char* file, size_t line, const char* what) :

diff --git a/src/lib/dhcp/tests/option_custom_unittest.cc b/src/lib/dhcp/tests/option_custom_unittest.cc
index f0fa1602ee2f40b096a7d58bb3e67b89aeae1873..b8e149081fa1b8681c2c6282d6e45dcccbabe09f 100644 (file)
--- a/src/lib/dhcp/tests/option_custom_unittest.cc
+++ b/src/lib/dhcp/tests/option_custom_unittest.cc
@@ -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