[#3108] fixed log message

diff --git a/ChangeLog b/ChangeLog
index 36f92f4f70bb9a490e0ecbcc17a388fdf11ce1e1..8060c0f17d2d6d394e1980d75d9b570279be01b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2198.  [func]          razvan
+       A new log message
+       DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_DETECTED is
+       shown when multiple reservations are detected for the same IP
+       address.
+       (Gitlab #3108)
+
 2197.  [func]          razvan
        Added support for database connection retry on server startup.
        The new 'retry-on-startup' parameter controls this behavior along

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc
index a9288a11a4c182010fc3ec9523f2c110c1a42c15..b3083e3936003566133585ba38da8e37a8c4132d 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc
@@ -313,7 +313,7 @@ const char* values[] = {
     "DHCPSRV_CFGMGR_FLQ_POPULATE_FREE_PREFIX_LEASES_DONE", "populated %1 free prefix leases for the FLQ allocator in subnet %2 completed in %3",
     "DHCPSRV_CFGMGR_IPV4_RESERVATIONS_NON_UNIQUE_IGNORED", "ignoring \"ip-reservations-unique\" setting because at least one of the host database backends does not support non-unique IP reservations in a subnet",
     "DHCPSRV_CFGMGR_IPV6_RESERVATIONS_NON_UNIQUE_IGNORED", "ignoring \"ip-reservations-unique\" setting because at least one of the host database backends does not support non unique IP reservations in a subnet",
-    "DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_DETECTED", "the \"ip-reservations-unique\" flag is set to false and multiple reservations for the IP address: %1 in subnet: %2 are not allowed causing error: %3",
+    "DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_DETECTED", "the \"ip-reservations-unique\" flag is set to true and multiple reservations for the IP address: %1 in subnet: %2 are not allowed causing error: %3",
     "DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_POSSIBLE", "setting \"ip-reservations-unique\" from false to true poses a risk that some host backends may still contain multiple reservations for the same IP address",
     "DHCPSRV_CFGMGR_NEW_SUBNET4", "a new subnet has been added to configuration: %1",
     "DHCPSRV_CFGMGR_NEW_SUBNET6", "a new subnet has been added to configuration: %1",

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index f032b186529370d11d39ddcf62655911f5027bc7..f9a282bf7ca168df86b18360863a940fb2dfe704 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -128,12 +128,12 @@ backends may still contain multiple reservations for the same IP addresses
 causing problems with lease allocation for certain addresses. Please ensure
 that all such duplicates are removed.
 
-% DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_DETECTED the "ip-reservations-unique" flag is set to false and multiple reservations for the IP address: %1 in subnet: %2 are not allowed causing error: %3
+% DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_DETECTED the "ip-reservations-unique" flag is set to true and multiple reservations for the IP address: %1 in subnet: %2 are not allowed causing error: %3
 This warning message is issued when the DHCP server is configured to not allow
 multiple reservations for the same IP address. However, the host database
-backends contains multiple reservations for the IP addresses which logged as
-the first argument, in the subnet logged as second argument, causing problems
-with lease allocation logged as third argument.
+backend contains multiple reservations for the IP address logged as the first
+argument, in the subnet logged as second argument, causing problems with lease
+allocation logged as third argument.
 
 % DHCPSRV_CFGMGR_NEW_SUBNET4 a new subnet has been added to configuration: %1
 This is an informational message reporting that the configuration has