From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 10 Apr 2019 14:30:14 +0000 (-0400)
Subject: [#413,!288] More review comments.
X-Git-Tag: Kea-1.6.0-beta~270^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96eecd565ad684c9dbb091716a244320194bb10c;p=thirdparty%2Fkea.git

[#413,!288] More review comments.
---

diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h
index 61c1aec044..3d957ea723 100644
--- a/src/lib/dhcpsrv/srv_config.h
+++ b/src/lib/dhcpsrv/srv_config.h
@@ -507,10 +507,14 @@ public:
     /// The @c other parameter must be a @c SrvConfig or its derivation.
     ///
     /// This method calls either @c merge4 or @c merge6 based on
-    /// @c CfgMgr::family_.
     ///
     /// Currently, the following parts of the configuration are merged:
-    /// - IPv4 subnets
+    /// - globals
+    /// - option definitions
+    /// - options
+    /// - via @c merge4 or @c merge6 depending on @c CfgMgr::family_:
+    ///     - shared networks
+    ///     - subnets
     ///
     /// @todo Add support for merging other configuration elements.
     ///
diff --git a/src/lib/dhcpsrv/tests/srv_config_unittest.cc b/src/lib/dhcpsrv/tests/srv_config_unittest.cc
index 0e81acfa9b..cdafcd5a41 100644
--- a/src/lib/dhcpsrv/tests/srv_config_unittest.cc
+++ b/src/lib/dhcpsrv/tests/srv_config_unittest.cc
@@ -1046,7 +1046,7 @@ TEST_F(SrvConfigTest, mergeGlobals4) {
 // This test verifies that globals from one SrvConfig
 // can be merged into another. It verifies that values
 // in the from-config override those in to-config which
-// override those in GLOBAL4_DEFAULTS.
+// override those in GLOBAL6_DEFAULTS.
 TEST_F(SrvConfigTest, mergeGlobals6) {
     // Set the family we're working with.
     CfgMgr::instance().setFamily(AF_INET6);