[#3108] addressed review comments

isc-projects · Dec 18, 2023 · cdfee49 · cdfee49
1 parent c0d98f7
commit cdfee49
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
@@ -5927,6 +5927,8 @@ configuration error will be emitted and the server will fail to start.
    the server ensures that IP reservations are unique for a subnet within
    a single host backend and/or Kea configuration file. It does not
    guarantee that the reservations are unique across multiple backends.
+   On server startup, only IP reservations defined in the Kea configuration
+   file are checked for uniqueness.
 
 The following is an example configuration with two reservations for
 the same IP address but different MAC addresses:
@@ -5977,7 +5979,7 @@ finds multiple reservations for the same IP address.
 
    Currently the Kea server does not verify whether multiple reservations for
    the same IP address exist in MySQL and/or PostgreSQL host databases when
-   ``ip-reservations-unique`` is updated from ``true`` to ``false``. This may
+   ``ip-reservations-unique`` is updated from ``false`` to ``true``. This may
    cause issues with lease allocations. The administrator must ensure that there
    is at most one reservation for each IP address within each subnet, prior to
    the configuration update.

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
@@ -5124,6 +5124,8 @@ configuration error will be emitted and the server will fail to start.
    the server ensures that IP reservations are unique for a subnet within
    a single host backend and/or Kea configuration file. It does not
    guarantee that the reservations are unique across multiple backends.
+   On server startup, only IP reservations defined in the Kea configuration
+   file are checked for uniqueness.
 
 
 The following is an example configuration with two reservations for
@@ -5177,7 +5179,7 @@ for the same IP address or delegated prefix.
    Currently the Kea server does not verify whether multiple reservations for
    the same IP address and/or delegated prefix exist in
    MySQL and/or PostgreSQL) host databases when ``ip-reservations-unique``
-   is updated from ``true`` to ``false``. This may cause issues with
+   is updated from ``false`` to ``true``. This may cause issues with
    lease allocations. The administrator must ensure that there is at
    most one reservation for each IP address and/or delegated prefix
    within each subnet, prior to the configuration update.

diff --git 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 true 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
@@ -128,7 +128,7 @@ 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 true 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
 backend contains multiple reservations for the IP address logged as the first