[#3084] Fixed log placeholder error

modified:
    dhcp4_messages.cc
    dhcp4_messages.mes
    dhcp4_srv.cc

diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc
index 9e9cbf45da7461962e183c5658ce637c7942ed99..1a52f027f0110eac4e7c475965ac19019406033e 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.cc
+++ b/src/bin/dhcp4/dhcp4_messages.cc
@@ -342,7 +342,7 @@ const char* values[] = {
     "DHCP4_RESPONSE_HOSTNAME_DATA", "%1: including Hostname option in the server's response: %2",
     "DHCP4_RESPONSE_HOSTNAME_GENERATE", "%1: server has generated hostname %2 for the client",
     "DHCP4_SERVER_FAILED", "server failed: %1",
-    "DHCP4_SERVER_INITIATED_DECLINE", "Lease for addr %1 has been found to be already be in use. The lease will be unavailable for %3 seconds.",
+    "DHCP4_SERVER_INITIATED_DECLINE", "Lease for addr %1 has been found to be already be in use. The lease will be unavailable for %2 seconds.",
     "DHCP4_SERVER_INITIATED_DECLINE_FAILED", "%1: error on server-initiated decline lease for address %2: %3",
     "DHCP4_SHUTDOWN", "server shutdown",
     "DHCP4_SHUTDOWN_REQUEST", "shutdown of server requested",

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 3aee9656f8910fe6003dc4fcc0ac8cdb3c1a7220..ecf3f5c4089a7c920ed0cbd28f70c97509f96399 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -1065,7 +1065,7 @@ identification information. The second argument holds the IPv4 address
 which decline was attempted. The last one contains the reason for
 failure.
 
-% DHCP4_SERVER_INITIATED_DECLINE Lease for addr %1 has been found to be already be in use. The lease will be unavailable for %3 seconds.
+% DHCP4_SERVER_INITIATED_DECLINE Lease for addr %1 has been found to be already be in use. The lease will be unavailable for %2 seconds.
 This informational message is printed when the server has detected via
 ICMP ECHO (i.e. ping check) or other means that a lease which should be
 free to offer is actually in use. This message may indicate a misconfiguration

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 68146ad74304b3fbdd172c7ad4b50daf1de117dd..64d96d1ed9a7f25fc10d765a2f08c8043a65ff41 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -4043,8 +4043,9 @@ Dhcpv4Srv::serverDecline(hooks::CalloutHandlePtr& /* callout_handle */, Pkt4Ptr&
     }
     */
 
-    LOG_INFO(lease4_logger, DHCP4_SERVER_INITIATED_DECLINE).arg(lease->addr_.toText())
-        .arg(query->getLabel()).arg(lease->valid_lft_);
+    LOG_INFO(lease4_logger, DHCP4_SERVER_INITIATED_DECLINE)
+            .arg(lease->addr_.toText())
+            .arg(lease->valid_lft_);
 }
 
 void