mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 22:45:18 +00:00
Code Issues Releases Wiki Activity

fixed compilation

Browse Source
This commit is contained in:
Razvan Becheriu
2018-02-14 20:12:49 +02:00
parent 1d36c1ea46
commit adc1970cd8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/dhcpsrv/cql_host_data_source.cc
View File

@@ -49,6 +49,7 @@
using namespace isc::asiolink; using namespace isc::asiolink;
using namespace isc::dhcp; using namespace isc::dhcp;
using namespace isc::util; using namespace isc::util;
using namespace isc::data;
namespace { namespace {
@@ -1057,9 +1058,9 @@ CqlHostExchange::retrieve() {
Host* host = new Host(host_identifier.data(), host_identifier.size(), Host* host = new Host(host_identifier.data(), host_identifier.size(),
host_identifier_type, ipv4_subnet_id, ipv6_subnet_id, host_identifier_type, ipv4_subnet_id, ipv6_subnet_id,
ipv4_reservation, hostname_, ipv4_reservation, hostname_,
host_ipv4_client_classes_, host_ipv6_client_classes_ host_ipv4_client_classes_, host_ipv6_client_classes_,
host_ipv4_next_server_, host_ipv4_server_hostname_, static_cast<uint32_t>(host_ipv4_next_server_),
host_ipv4_boot_file_name_); host_ipv4_server_hostname_, host_ipv4_boot_file_name_);
// Set the user context if there is one. // Set the user context if there is one.
if (!user_context_.empty()) { if (!user_context_.empty()) {
@@ -1071,7 +1072,7 @@ CqlHostExchange::retrieve() {
} }
host->setContext(ctx); host->setContext(ctx);
} catch (const isc::data::JSONError& ex) { } catch (const isc::data::JSONError& ex) {
isc_throw(BadValue, "user context '" << user_context isc_throw(BadValue, "user context '" << user_context_
<< "' is invalid JSON: " << ex.what()); << "' is invalid JSON: " << ex.what());
} }
} }
@@ -1196,7 +1197,7 @@ CqlHostExchange::retrieveOption() const {
// Set the user context if there is one into the option descriptor. // Set the user context if there is one into the option descriptor.
if (!option_user_context_.empty()) { if (!option_user_context_.empty()) {
try { try {
ConstElementPtr ctx = Element::fromJSON(option_user_context_)); ConstElementPtr ctx = Element::fromJSON(option_user_context_);
if (!ctx || (ctx->getType() != Element::map)) { if (!ctx || (ctx->getType() != Element::map)) {
isc_throw(BadValue, "option user context '" << option_user_context_ isc_throw(BadValue, "option user context '" << option_user_context_
<< "' is no a JSON map"); << "' is no a JSON map");

1
src/share/database/scripts/pgsql/dhcpdb_create.pgsql
View File

@@ -35,7 +35,6 @@ CREATE TABLE lease4 (
hostname VARCHAR(255) -- The FQDN of the client hostname VARCHAR(255) -- The FQDN of the client
); );
-- Create search indexes for lease4 table -- Create search indexes for lease4 table
-- index by hwaddr and subnet_id -- index by hwaddr and subnet_id
CREATE INDEX lease4_by_hwaddr_subnet_id ON lease4 (hwaddr, subnet_id); CREATE INDEX lease4_by_hwaddr_subnet_id ON lease4 (hwaddr, subnet_id);