mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

[3409] Addressed review comments.

Browse Source
This commit is contained in:
Marcin Siodelski
2014-04-29 18:27:14 +02:00
parent dc69d95585
commit d596586365
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/dhcp4/config_parser.cc
View File

@@ -561,6 +561,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator option_config = std::map<std::string, ConstElementPtr>::const_iterator option_config =
values_map.find("option-data"); values_map.find("option-data");
if (option_config != values_map.end()) { if (option_config != values_map.end()) {
config_pair.first = "option-data";
option_parser->build(option_config->second); option_parser->build(option_config->second);
option_parser->commit(); option_parser->commit();
} }
@@ -569,6 +570,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator subnet_config = std::map<std::string, ConstElementPtr>::const_iterator subnet_config =
values_map.find("subnet4"); values_map.find("subnet4");
if (subnet_config != values_map.end()) { if (subnet_config != values_map.end()) {
config_pair.first = "subnet4";
subnet_parser->build(subnet_config->second); subnet_parser->build(subnet_config->second);
} }

2
src/bin/dhcp6/config_parser.cc
View File

@@ -773,6 +773,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator option_config = std::map<std::string, ConstElementPtr>::const_iterator option_config =
values_map.find("option-data"); values_map.find("option-data");
if (option_config != values_map.end()) { if (option_config != values_map.end()) {
config_pair.first = "option-data";
option_parser->build(option_config->second); option_parser->build(option_config->second);
option_parser->commit(); option_parser->commit();
} }
@@ -781,6 +782,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator subnet_config = std::map<std::string, ConstElementPtr>::const_iterator subnet_config =
values_map.find("subnet6"); values_map.find("subnet6");
if (subnet_config != values_map.end()) { if (subnet_config != values_map.end()) {
config_pair.first = "subnet6";
subnet_parser->build(subnet_config->second); subnet_parser->build(subnet_config->second);
} }

3
src/lib/dhcpsrv/testutils/Makefile.am
View File

@@ -15,10 +15,11 @@ if HAVE_GTEST
noinst_LTLIBRARIES = libdhcpsrvtest.la noinst_LTLIBRARIES = libdhcpsrvtest.la
libdhcpsrvtest_la_SOURCES = config_result_check.cc config_result_check.h libdhcpsrvtest_la_SOURCES = config_result_check.cc config_result_check.h
libdhcpsrvtest_la_CXXFLAGS = $(AM_CXXFLAGS) libdhcpsrvtest_la_CXXFLAGS = $(AM_CXXFLAGS)
libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS) libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS)
libdhcpsrvtest_la_LDFLAGS = $(AM_LDFLAGS) libdhcpsrvtest_la_LDFLAGS = $(AM_LDFLAGS)
libdhcpsrvtest_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libdhcpsrvtest_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la
libdhcpsrvtest_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
endif endif