From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 5 Dec 2012 14:23:34 +0000 (+0100)
Subject: [2270] Fix for repeated reconf in dhcp6 (old defaults are now removed)
X-Git-Tag: bind10-1.0.0-beta-release~29^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdeb3c67d12483d7ed6945e7d190195764e24fcc;p=thirdparty%2Fkea.git

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

diff --git a/src/bin/dhcp6/config_parser.cc b/src/bin/dhcp6/config_parser.cc
index 6cc1872e84..5516614040 100644
--- a/src/bin/dhcp6/config_parser.cc
+++ b/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;