From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 14 Aug 2018 12:24:55 +0000 (-0400)
Subject: [5705] Minor review revisions
X-Git-Tag: gitlab29-base~50^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbed2f1151c568ca546f989a77c427019a011187;p=thirdparty%2Fkea.git

[5705] Minor review revisions
---

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index 30c811a6e3..f1c6f03693 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -3553,8 +3553,7 @@ It is merely echoed by the server
       </para>
       <note>You can reserve any ip-address in a global reservation. Just keep
       in mind that Kea will not do any sanity checking on the address and for
-      Kea 1.5.0, support for global reservation mechanism should be
-      considered experimental.
+      Kea 1.5.0, support for global reservations should be considered experimental.
       </note>
     </section>
 
@@ -3638,7 +3637,7 @@ It is merely echoed by the server
      <para>The conflict resolution mechanism does not work for global
      reservations. As of Kea 1.5.0, it is generally recommended to not use
      global reservations for addresses. If you want to use it anyway,
-     you have to manually ensure that the reserved addressed are non
+     you have to manually ensure that the reserved addressed are not
      in the dynamic pools.</para>
     </note>
 
@@ -4055,11 +4054,11 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
     enabled.</para>
 
     <para>This feature can be used to assign certain parameters, such as
-    hostname or some dedicated, host specific options. It can also be used to
+    hostname or other dedicated, host-specific options. It can also be used to
     assign addresses. However, global reservations that assign addresses bypass
     the whole topology determination provided by DHCP logic implemented in
     Kea. It is very easy to misuse this feature and get configuration that is
-    inconsistent. To give specific example, imagine a case of global reservation
+    inconsistent. To give a specific example, imagine a global reservation
     for address 192.0.2.100 and two subnets 192.0.2.0/24 and 192.0.5.0/24. If
     global reservations are used in both subnets and a device matching global
     host reservations visits part of the network that is serviced by
diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index acb8bf0925..ca66463c07 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -608,12 +608,10 @@ Dhcpv4SrvTest::configure(const std::string& config, NakedDhcpv4Srv& srv,
     try {
         json = parseJSON(config);
     } catch (const std::exception& ex){
+        // Fatal falure on parsing error
         FAIL() << "parsing failure:"
                 << "config:" << config << std::endl
                 << "error: " << ex.what();
-
-        // No point in going deeper into the swamp...
-        return;
     }
 
     ConstElementPtr status;