Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
737a7959
Commit
737a7959
authored
Jan 26, 2017
by
Tomek Mrugalski
🛰
Browse files
[5019_rebase] Fix after rebase.
parent
e1591d82
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/json_config_parser.cc
View file @
737a7959
...
...
@@ -740,15 +740,6 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
// Setup the command channel.
configureCommandChannel
();
// the leases database parser is the last to be run.
std
::
map
<
std
::
string
,
ConstElementPtr
>::
const_iterator
leases_config
=
values_map
.
find
(
"lease-database"
);
if
(
leases_config
!=
values_map
.
end
())
{
config_pair
.
first
=
"lease-database"
;
leases_parser
->
build
(
leases_config
->
second
);
leases_parser
->
commit
();
}
// Apply global options in the staging config.
Dhcp4ConfigParser
global_parser
;
global_parser
.
parse
(
mutable_cfg
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment