Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
4eb189a4
Commit
4eb189a4
authored
Jan 03, 2017
by
Tomek Mrugalski
🛰
Browse files
[trac5021] Merge branch 'trac5021' of
ssh://git.kea.isc.org/git/kea
into trac5021
parents
addced65
b91a7215
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/json_config_parser.cc
View file @
4eb189a4
...
...
@@ -566,7 +566,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
// This is a way to convert ConstElementPtr to ElementPtr.
// We need a config that can be edited, because we will insert
// default values and will insert derived values as well.
ElementPtr
mutable_cfg
=
const_pointer_cast
<
Element
>
(
config_set
);
ElementPtr
mutable_cfg
=
boost
::
const_pointer_cast
<
Element
>
(
config_set
);
// Set all default values if not specified by the user.
SimpleParser4
::
setAllDefaults
(
mutable_cfg
);
...
...
src/bin/dhcp6/json_config_parser.cc
View file @
4eb189a4
...
...
@@ -840,7 +840,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
// This is a way to convert ConstElementPtr to ElementPtr.
// We need a config that can be edited, because we will insert
// default values and will insert derived values as well.
ElementPtr
mutable_cfg
=
const_pointer_cast
<
Element
>
(
config_set
);
ElementPtr
mutable_cfg
=
boost
::
const_pointer_cast
<
Element
>
(
config_set
);
SimpleParser6
::
setAllDefaults
(
mutable_cfg
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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