[#730,!2-p] Addressed review comments

    Minor cleanup

ChangeLog
src/bin/dhcp4/dhcp4_messages.mes
src/bin/dhcp4/dhcp4_srv.cc
src/lib/dns/tests/name_unittest.cc

diff --git a/ChangeLog b/ChangeLog
index c9c6ab749d2b31735f67ae2d6c41353ade6f7021..4d05cfc10df3928c82166f83ab7778ca0de4b079 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
        hostname or FQDN options are received.  Now the servers will
        drop the DHCP packets containing the malformed options.
        CVE:2019-6473
-       (Gitlab #730,private!2 git a2a98c421bb400a81218bd28d6a6f62accd31b1f)
+       (Gitlab #730,!2-p git a2a98c421bb400a81218bd28d6a6f62accd31b1f)
 
 1651.  [security]              tmark
        Added logic to kea-dhcp6 to catch values for client or

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index b859fa50a3160ee941098db6dffb3b80bbece872..7a0b1c19f2e18dbacf75897438fdacd7d2b5ee1f 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -116,8 +116,7 @@ client.
 This debug message is issued when the DHCP server was unable to process the
 the hostname option sent by the client because the content is malformed.
 The first argument includes the client and transaction identification
-information. The second argument should contain a description of the data
-error.
+information. The second argument contains a description of the data error.
 
 % DHCP4_CLIENT_HOSTNAME_PROCESS %1: processing client's Hostname option
 This debug message is issued when the server starts processing the Hostname

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index bd343a2cb1a67b8066a800c3ab567588ac868db5..d6614f737b0da06c5f951756029f6197e94dbcf2 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -1824,7 +1824,7 @@ Dhcpv4Srv::processHostnameOption(Dhcpv4Exchange& ex) {
         // going to explicitly catch that here.
         label_count = OptionDataTypeUtil::getLabelCount(hostname);
     } catch (const std::exception& exc) {
-        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL_DATA, DHCP4_CLIENT_HOSTNAME_MALFORMED)
+        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL, DHCP4_CLIENT_HOSTNAME_MALFORMED)
             .arg(ex.getQuery()->getLabel())
             .arg(exc.what());
         return;
@@ -1835,7 +1835,7 @@ Dhcpv4Srv::processHostnameOption(Dhcpv4Exchange& ex) {
     /// @todo It would be more liberal to accept this and let it fall into
     /// the case  of replace or less than two below.
     if (label_count == 0) {
-        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL_DATA, DHCP4_EMPTY_HOSTNAME)
+        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL, DHCP4_EMPTY_HOSTNAME)
             .arg(ex.getQuery()->getLabel());
         return;
     }

diff --git a/src/lib/dns/tests/name_unittest.cc b/src/lib/dns/tests/name_unittest.cc
index 7ae2c9151507a3f7fef444b6d555407c76690387..caf1f12e16a0baffc4eca4e563b6eee52b42ac20 100644 (file)
--- a/src/lib/dns/tests/name_unittest.cc
+++ b/src/lib/dns/tests/name_unittest.cc
@@ -290,7 +290,7 @@ TEST_F(NameTest, fromText) {
 }
 
 // The following test uses a name data that was produced by
-// fuz testing and causes an unexpected condition in stringParser.
+// fuzz testing and causes an unexpected condition in stringParser.
 // Formerly this condition was trapped by an assert, but for
 // robustness it has been replaced by a throw.
 TEST_F(NameTest, unexpectedParseError) {