[#1428] Replaced 'including' with 'having' in msgs

Also added a new line per review comments.

diff --git a/src/lib/dhcpsrv/hosts_messages.cc b/src/lib/dhcpsrv/hosts_messages.cc
index b0a103ff236dc57e308af1962a4687c6fe5f409f..1076081a872d227c3c71f555aa30d95a04320d1a 100644 (file)
--- a/src/lib/dhcpsrv/hosts_messages.cc
+++ b/src/lib/dhcpsrv/hosts_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/hosts_messages.mes on Mon Sep 28 2020 14:55
+// File created from ../../../src/lib/dhcpsrv/hosts_messages.mes on Thu Oct 01 2020 13:07
 
 #include <cstddef>
 #include <log/message_types.h>
@@ -86,7 +86,7 @@ const char* values[] = {
     "HOSTS_CFG_CACHE_HOST_DATA_SOURCE", "get host cache data source: %1",
     "HOSTS_CFG_CLOSE_HOST_DATA_SOURCE", "Closing host data source: %1",
     "HOSTS_CFG_DEL_ALL_SUBNET4", "deleted all %1 host(s) for subnet id %2",
-    "HOSTS_CFG_DEL_ALL_SUBNET6", "deleted all %1 host(s) including %2 IPv6 reservation(s) for subnet id %3",
+    "HOSTS_CFG_DEL_ALL_SUBNET6", "deleted all %1 host(s) having %2 IPv6 reservation(s) for subnet id %3",
     "HOSTS_CFG_GET_ALL", "get all hosts with reservations",
     "HOSTS_CFG_GET_ALL_ADDRESS4", "get all hosts with reservations for IPv4 address %1",
     "HOSTS_CFG_GET_ALL_ADDRESS4_COUNT", "using address %1, found %2 host(s)",
@@ -126,7 +126,7 @@ const char* values[] = {
     "HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4", "get one host with reservation for subnet id %1 and IPv4 address %2",
     "HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_HOST", "using subnet id %1 and address %2, found host: %3",
     "HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_NULL", "host not found using subnet id %1 and address %2",
-    "HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6", "get one host with reservation for subnet id %1 and including IPv6 address %2",
+    "HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6", "get one host with reservation for subnet id %1 and having IPv6 address %2",
     "HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_HOST", "using subnet id %1 and address %2, found host: %3",
     "HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_NULL", "host not found using subnet id %1 and address %2",
     "HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER", "get one host with %1 reservation for subnet id %2, identified by %3",

diff --git a/src/lib/dhcpsrv/hosts_messages.h b/src/lib/dhcpsrv/hosts_messages.h
index f056857350f07c95261a005c2e4c27c42b550b1b..ddd4120f272bd4f3c29f51bb517ac46fcd13cc6c 100644 (file)
--- a/src/lib/dhcpsrv/hosts_messages.h
+++ b/src/lib/dhcpsrv/hosts_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/hosts_messages.mes on Mon Sep 28 2020 14:55
+// File created from ../../../src/lib/dhcpsrv/hosts_messages.mes on Thu Oct 01 2020 13:07
 
 #ifndef HOSTS_MESSAGES_H
 #define HOSTS_MESSAGES_H

diff --git a/src/lib/dhcpsrv/hosts_messages.mes b/src/lib/dhcpsrv/hosts_messages.mes
index 06a7844edde6a6e832b474fb76d87b936ae213a5..414273982daaa0f54464feb0f66315911fadc84f 100644 (file)
--- a/src/lib/dhcpsrv/hosts_messages.mes
+++ b/src/lib/dhcpsrv/hosts_messages.mes
@@ -36,7 +36,7 @@ This debug message is issued when all IPv4 reservations are deleted for
 the specified subnet. The first argument specifies how many reservations
 have been deleted. The second argument is the subnet identifier.
 
-% HOSTS_CFG_DEL_ALL_SUBNET6 deleted all %1 host(s) including %2 IPv6 reservation(s) for subnet id %3
+% HOSTS_CFG_DEL_ALL_SUBNET6 deleted all %1 host(s) having %2 IPv6 reservation(s) for subnet id %3
 This debug message is issued when all IPv6 reservations are deleted for
 the specified subnet. The first argument specifies how many hosts
 have been deleted. The second argument specifies how many IPv6
@@ -147,7 +147,7 @@ This debug message is issued when starting to retrieve all hosts connected to
 the specific DHCPv4 subnet. The argument specifies subnet id.
 
 % HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS4 get all hosts with reservations for subnet id %1 and IPv4 address %2
-This debug message is issued when starting to retrieve all hosts including
+This debug message is issued when starting to retrieve all hosts having
 the reservation for the given IPv4 address within the given subnet. The
 first argument specifies subnet identifier. The second argument specifies
 the IPv4 address for which the reservation is to be returned.
@@ -230,7 +230,7 @@ subnet id and IPv4 address.
 This debug message is issued when no host was found for the specified
 subnet id and IPv4 address.
 
-% HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6 get one host with reservation for subnet id %1 and including IPv6 address %2
+% HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6 get one host with reservation for subnet id %1 and having IPv6 address %2
 This debug message is issued when starting to retrieve a host connected to the
 specific subnet and having the specific IPv6 address reserved. The
 arguments specify subnet id and IPv6 address respectively.
@@ -317,4 +317,4 @@ server to allow multiple host reservations for the same IP address or prefix.
 Some host database backends may not support this mode of operation. In this
 case the administrator should stop using these backends or fall back to the
 default setting which requires that IP addresses are unique within a subnet.
-This setting is guaranteed to work for MySQL and Postgres host backends.
\ No newline at end of file
+This setting is guaranteed to work for MySQL and Postgres host backends.