Commit 0387d65f authored by Thomas Markwalder's avatar Thomas Markwalder

[3432] Fixed compilation error in d2_cfg_mgr.cc

Minor compilation error incurred after review changes.
parent ff3fc5e4
......@@ -41,8 +41,12 @@ if test x$rpath != xno; then
ISC_RPATH_FLAG=-Wl,-R
],[ AC_MSG_RESULT(no)
AC_MSG_CHECKING([whether -R flag is available in linker])
CXXFLAGS="$CXXFLAGS_SAVED -R"
CCFLAGS="$CCFLAGS_SAVED -R"
# Apple clang 5.1 is now considers unknown parameters passed to linker (ld) as errors.
# However, the same unknown parameters passed to compiler (g++ ) are merely threated
# as warnings. To make sure that we pick those up, is to use -Werror.
CXXFLAGS="$CXXFLAGS_SAVED -R/usr/lib"
CCFLAGS="$CCFLAGS_SAVED -R/usr/lib"
AC_TRY_LINK([], [],
[ AC_MSG_RESULT([yes; note that -R is more sensitive about the position in option arguments])
ISC_RPATH_FLAG=-R
......
......@@ -204,12 +204,12 @@ D2CfgMgr::buildParams(isc::data::ConstElementPtr params_config) {
// Fetch the parameters from the context to create the D2Params.
D2CfgContextPtr context = getD2CfgContext();
isc::dhcp::StringStoragePtr& strings = context->getStringStorage();
isc::dhcp::StringStoragePtr strings = context->getStringStorage();
asiolink::IOAddress ip_address(strings->
getOptionalParam("ip_address",
D2Params::DFT_IP_ADDRESS));
isc::dhcp::Uint32StoragePtr& ints = context->getUint32Storage();
isc::dhcp::Uint32StoragePtr ints = context->getUint32Storage();
uint32_t port = ints->getOptionalParam("port", D2Params::DFT_PORT);
uint32_t dns_server_timeout
......
......@@ -31,7 +31,7 @@ namespace d2 {
const char* TEST_DNS_SERVER_IP = "127.0.0.1";
size_t TEST_DNS_SERVER_PORT = 5301;
const bool HAS_RDATA = true;
//const bool HAS_RDATA = true;
const bool NO_RDATA = false;
//*************************** FauxServer class ***********************
......
......@@ -649,6 +649,7 @@ const char* const root_servers[] = {
"j.root-servers.net", "k.root-servers.net", "l.root-servers.net",
"m.root-servers.net", NULL
};
#if 0
const char* const gtld_servers[] = {
"a.gtld-servers.net", "b.gtld-servers.net", "c.gtld-servers.net",
"d.gtld-servers.net", "e.gtld-servers.net", "f.gtld-servers.net",
......@@ -656,6 +657,7 @@ const char* const gtld_servers[] = {
"j.gtld-servers.net", "k.gtld-servers.net", "l.gtld-servers.net",
"m.gtld-servers.net", NULL
};
#endif
const char* const jp_servers[] = {
"a.dns.jp", "b.dns.jp", "c.dns.jp", "d.dns.jp", "e.dns.jp",
"f.dns.jp", "g.dns.jp", NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment