From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 1 Jul 2019 11:52:20 +0000 (-0400)
Subject: [#686,!403] Addressed review comments
X-Git-Tag: Kea-1.6.0-beta2~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68b2cb0385779ef0c520164e418dee124d7cb364;p=thirdparty%2Fkea.git

[#686,!403] Addressed review comments

     Fixed cosmetics. Spacing etc...
---

diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc
index 861356160f..e38c2f328b 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser4.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc
@@ -166,8 +166,8 @@ const SimpleDefaults SimpleParser4::IFACE4_DEFAULTS = {
 /// @brief This table defines default values for dhcp-queue-control in DHCPv4.
 const SimpleDefaults SimpleParser4::DHCP_QUEUE_CONTROL4_DEFAULTS = {
     { "enable-queue",   Element::boolean, "false"},
-    { "queue-type", Element::string,  "kea-ring4"},
-    { "capacity",  Element::integer, "500"}
+    { "queue-type",     Element::string,  "kea-ring4"},
+    { "capacity",       Element::integer, "500"}
 };
 
 /// @brief This defines default values for sanity checking for DHCPv4.
diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc
index 53088d5476..73e85c59b0 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser6.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc
@@ -149,8 +149,8 @@ const SimpleDefaults SimpleParser6::IFACE6_DEFAULTS = {
 /// @brief This table defines default values for dhcp-queue-control in DHCPv4.
 const SimpleDefaults SimpleParser6::DHCP_QUEUE_CONTROL6_DEFAULTS = {
     { "enable-queue",   Element::boolean, "false"},
-    { "queue-type", Element::string,  "kea-ring6"},
-    { "capacity",  Element::integer, "500"}
+    { "queue-type",     Element::string,  "kea-ring6"},
+    { "capacity",       Element::integer, "500"}
 };
 
 /// @brief This defines default values for sanity checking for DHCPv6.
diff --git a/src/lib/dhcpsrv/sanity_checker.cc b/src/lib/dhcpsrv/sanity_checker.cc
index dd4b6264a8..19b1402ea2 100644
--- a/src/lib/dhcpsrv/sanity_checker.cc
+++ b/src/lib/dhcpsrv/sanity_checker.cc
@@ -94,9 +94,6 @@ void SanityChecker::checkLeaseInternal(LeasePtrType& lease, const CfgConsistency
     }
 
     switch (checks->getLeaseSanityCheck()) {
-    case CfgConsistency::LEASE_CHECK_NONE:
-        // No checks whatsoever, just return the lease as-is.
-        break;
     case CfgConsistency::LEASE_CHECK_WARN:
         if (lease->subnet_id_ != id) {
             // Print a warning, but return the lease as is.
@@ -149,6 +146,7 @@ void SanityChecker::checkLeaseInternal(LeasePtrType& lease, const CfgConsistency
 
         }
         break;
+
     case CfgConsistency::LEASE_CHECK_DEL:
         if (lease->subnet_id_ != id) {
             LOG_INFO(dhcpsrv_logger, DHCPSRV_LEASE_SANITY_FAIL_DISCARD)
@@ -158,6 +156,13 @@ void SanityChecker::checkLeaseInternal(LeasePtrType& lease, const CfgConsistency
             lease.reset();
         }
         break;
+
+    default:
+        // Shouldn't get here but some compilers and analyzers
+        // complain.  We'll we treat it as NONE and return the 
+        // lease as-is.
+        break;
+
     }
 
     // Additional checks may be implemented in the future here.