From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 29 Aug 2025 04:08:24 +0000 (+0300)
Subject: [#3986] addressed review comments
X-Git-Tag: Kea-3.1.2~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c725f14ba306a73ad801c0318897122edd6831a;p=thirdparty%2Fkea.git

[#3986] addressed review comments
---

diff --git a/ChangeLog b/ChangeLog
index 3dde8cb10e..840e8bedc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2392.	[func]		razvan
+	Reject 'config-set' and 'config-reload' commands when lease
+	file cleanup process is running.
+	(Gitlab #3986)
+
 Kea 3.1.1 (development) released on September 27, 2025
 
 2391.	[bug]		fdupont
diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index ab0800d145..e5a314b302 100644
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -1809,7 +1809,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configReloadBrokenFile) {
     ::remove("test7.json");
 }
 
-// Tests if config-reload attempts to reload a file while LFC is running
+// Check that the "config-reload" fails when LFC is running.
 TEST_F(CtrlChannelDhcpv4SrvTest, configReloadLFCRunning) {
     createUnixChannelServer();
     std::string response;
diff --git a/src/bin/dhcp4/tests/http_control_socket_unittest.cc b/src/bin/dhcp4/tests/http_control_socket_unittest.cc
index 947482be54..48579a744a 100644
--- a/src/bin/dhcp4/tests/http_control_socket_unittest.cc
+++ b/src/bin/dhcp4/tests/http_control_socket_unittest.cc
@@ -532,7 +532,7 @@ public:
     // file is not a valid JSON.
     void testConfigReloadBrokenFile();
 
-    // Tests if config-reload attempts to reload a file while LFC is running.
+    // Tests if config-reload fails to reload a file while LFC is running.
     void testConfigReloadLFCRunning();
 
     // Tests if config-reload attempts to reload a file and reports that the
@@ -2827,7 +2827,7 @@ TEST_F(HttpsCtrlChannelDhcpv4Test, configReloadBrokenFile) {
     testConfigReloadBrokenFile();
 }
 
-// Tests if config-reload attempts to reload a file while LFC is running.
+// Check that the "config-reload" fails when LFC is running.
 void
 BaseCtrlChannelDhcpv4Test::testConfigReloadLFCRunning() {
     createHttpChannelServer();
diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index d6ca8608c8..f0d5eac636 100644
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -1813,7 +1813,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configReloadBrokenFile) {
     ::remove("test7.json");
 }
 
-// Tests if config-reload attempts to reload a file while LFC is running
+// Check that the "config-reload" fails when LFC is running.
 TEST_F(CtrlChannelDhcpv6SrvTest, configReloadLFCRunning) {
     createUnixChannelServer();
     std::string response;
diff --git a/src/bin/dhcp6/tests/http_control_socket_unittest.cc b/src/bin/dhcp6/tests/http_control_socket_unittest.cc
index 1fc1bfc792..06ba22761e 100644
--- a/src/bin/dhcp6/tests/http_control_socket_unittest.cc
+++ b/src/bin/dhcp6/tests/http_control_socket_unittest.cc
@@ -543,7 +543,7 @@ public:
     // file is not a valid JSON.
     void testConfigReloadBrokenFile();
 
-    // Tests if config-reload attempts to reload a file while LFC is running.
+    // Tests if config-reload fails to reload a file while LFC is running.
     void testConfigReloadLFCRunning();
 
     // Tests if config-reload attempts to reload a file and reports that the
@@ -2827,7 +2827,7 @@ TEST_F(HttpsCtrlChannelDhcpv6Test, configReloadBrokenFile) {
     testConfigReloadBrokenFile();
 }
 
-// Tests if config-reload attempts to reload a file while LFC is running.
+// Check that the "config-reload" fails when LFC is running.
 void
 BaseCtrlChannelDhcpv6Test::testConfigReloadLFCRunning() {
     createHttpChannelServer();