Browse Source

[2270] Fix for repeated reconf in dhcp6 (old defaults are now removed)

Tomek Mrugalski 12 years ago
parent
commit
bdeb3c67d1
1 changed files with 7 additions and 2 deletions
  1. 7 2
      src/bin/dhcp6/config_parser.cc

+ 7 - 2
src/bin/dhcp6/config_parser.cc

@@ -752,10 +752,15 @@ DhcpConfigParser* createGlobalDhcpConfigParser(const std::string& config_id) {
 ConstElementPtr
 configureDhcp6Server(Dhcpv6Srv& , ConstElementPtr config_set) {
     if (!config_set) {
-        isc_throw(Dhcp6ConfigError,
-                  "Null pointer is passed to configuration parser");
+        ConstElementPtr answer = isc::config::createAnswer(1,
+                                 string("Can't parse NULL config"));
+        return (answer);
     }
 
+    /// Let's wipe previous configuration defaults
+    uint32_defaults.clear();
+    string_defaults.clear();
+
     /// @todo: append most essential info here (like "2 new subnets configured")
     string config_details;