]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2637] Fixed invalid config object used in DHCP config handler.
authorMarcin Siodelski <marcin@isc.org>
Mon, 21 Jan 2013 10:29:41 +0000 (11:29 +0100)
committerMarcin Siodelski <marcin@isc.org>
Mon, 21 Jan 2013 10:29:41 +0000 (11:29 +0100)
src/bin/dhcp4/ctrl_dhcp4_srv.cc

index 04502c1dda483d70e4c4226c6803f81e92bb6321..8ac49d3cde3cee650b1dc348135aba04b5fc7433 100644 (file)
@@ -101,7 +101,7 @@ ControlledDhcpv4Srv::dhcp4ConfigHandler(ConstElementPtr new_config) {
     }
 
     // Configure the server.
-    return (configureDhcp4Server(*server_, full_config));
+    return (configureDhcp4Server(*server_, merged_config));
 }
 
 ConstElementPtr