From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 21 Jan 2013 10:29:41 +0000 (+0100)
Subject: [2637] Fixed invalid config object used in DHCP config handler.
X-Git-Tag: bind10-1.0.0-rc-release~29^2~1^2~17^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bbf2ae947fdfb85b57fcd41a5c3f386bbadd221;p=thirdparty%2Fkea.git

[2637] Fixed invalid config object used in DHCP config handler.
---

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 04502c1dda..8ac49d3cde 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -101,7 +101,7 @@ ControlledDhcpv4Srv::dhcp4ConfigHandler(ConstElementPtr new_config) {
     }
 
     // Configure the server.
-    return (configureDhcp4Server(*server_, full_config));
+    return (configureDhcp4Server(*server_, merged_config));
 }
 
 ConstElementPtr