From: Francis Dupont <fdupont@isc.org>
Date: Wed, 19 Apr 2017 14:41:29 +0000 (+0200)
Subject: [5186] Applied fix to DHCPv6 too
X-Git-Tag: trac5243x_base~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a62c62639f9d4e4da340e350bb52475130388a03;p=thirdparty%2Fkea.git

[5186] Applied fix to DHCPv6 too
---

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 115e5621d5..96712d5ae6 100644
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -608,7 +608,9 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set,
     Subnet::resetSubnetID();
 
     // Remove any existing timers.
-    TimerMgr::instance()->unregisterTimers();
+    if (!check_only) {
+        TimerMgr::instance()->unregisterTimers();
+    }
 
     // Revert any runtime option definitions configured so far and not committed.
     LibDHCP::revertRuntimeOptionDefs();