From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 30 May 2014 12:39:52 +0000 (+0200)
Subject: [3399] Kea config backend no longer silently ignores NULL configuration results
X-Git-Tag: trac3434_base~15^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c56abc1d86e77e6da78e6efe2868d6eddbbff748;p=thirdparty%2Fkea.git

[3399] Kea config backend no longer silently ignores NULL configuration results
---

diff --git a/src/bin/dhcp4/kea_controller.cc b/src/bin/dhcp4/kea_controller.cc
index 3984fd2894..a8d43e8362 100644
--- a/src/bin/dhcp4/kea_controller.cc
+++ b/src/bin/dhcp4/kea_controller.cc
@@ -79,9 +79,10 @@ ControlledDhcpv4Srv::init(const std::string& file_name) {
         // but as the configureDhcp4Server returns a pointer, it is theoretically
         // possible that it will return NULL.
         LOG_ERROR(dhcp4_logger, DHCP4_CONFIG_LOAD_FAIL)
-            .arg("Configuration failed: Undefined result of configureDhcp4Server"
-                 "() function after attempting to read " + file_name);
-        return;
+            .arg("Configuration failed: Undefined result of processCommand("
+                 "config-reload, " + file_name + ")");
+        isc_throw(BadValue, "Configuration failed: Undefined result of "
+                  "processCommand('config-reload', " + file_name + ")");
     }
 
     // Now check is the returned result is successful (rcode=0) or not