[#401,!254] Options are now created when merging subnets

src/lib/dhcpsrv/cfg_subnets4.*
    CfgSubnets4::merge() - added cfg_def, now
    creates options for each subnet and their pools.

src/lib/dhcpsrv/srv_config.cc
    SrvConfig::merge4() - passes merged option defs
    into subnets merge.

src/lib/dhcpsrv/subnet.h
    Subnet::getPoolsWritable() - changed to public.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h
index 31d6680ca7..c2c16ff28e 100644
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@ -289,7 +289,6 @@ public:
         shared_network_name_ = shared_network_name;
     }
 
-protected:
     /// @brief Returns all pools (non-const variant)
     ///
     /// The reference is only valid as long as the object that returned it.
@@ -298,6 +297,8 @@ protected:
     /// @return a collection of all pools
     PoolCollection& getPoolsWritable(Lease::Type type);
 
+protected:
+
     /// @brief Protected constructor
     //
     /// By making the constructor protected, we make sure that no one will