[4097a] Removed merging of global configured options into subnets

diff --git a/src/lib/dhcpsrv/cfg_option.h b/src/lib/dhcpsrv/cfg_option.h
index 5db8177dc1755d5958f17825f0615cff3f35f345..2fea357acc8a9f3d803f684633909245254b626e 100644 (file)
--- a/src/lib/dhcpsrv/cfg_option.h
+++ b/src/lib/dhcpsrv/cfg_option.h
@@ -264,6 +264,8 @@ public:
     /// as a parameter. If an item exists in the destination it is not
     /// copied.
     ///
+    /// @note: this method is not longer used so should become private.
+    ///
     /// @param [out] other Configuration object to merge to.
     void mergeTo(CfgOption& other) const;
 

diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
index 49ecadbe018d1b9d15cd038d629295694fafe8aa..18d2cc846e1bf80a6ca83721e22bb7af1db269a3 100644 (file)
--- a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
@@ -1256,8 +1256,10 @@ SubnetConfigParser::createSubnet() {
         subnet_->setIface(iface);
     }
 
-    // Merge globally defined options to the subnet specific options.
-    CfgMgr::instance().getStagingCfg()->getCfgOption()->mergeTo(*options_);
+    // Here globally defined options were merged to the subnet specific
+    // options but it is no longer the case (they have a different
+    // and not consecutive priority).
+
     // Copy all options to the subnet configuration.
     options_->copyTo(*subnet_->getCfgOption());
     // Append suboptions to the top-level options.