From 8db8de0e102a46bc194d0da73dc1d8083de57bff Mon Sep 17 00:00:00 2001 From: Wlodek Wencel Date: Thu, 27 Apr 2017 12:34:08 +0200 Subject: [PATCH] [v1_2_0] .mes, Makefile and copy-right dates updated for release --- doc/guide/kea-guide.xml | 2 +- src/lib/cryptolink/Makefile.am | 1 + src/lib/dhcpsrv/hosts_messages.mes | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/guide/kea-guide.xml b/doc/guide/kea-guide.xml index 3aed991fc6..839cf4c3d7 100644 --- a/doc/guide/kea-guide.xml +++ b/doc/guide/kea-guide.xml @@ -32,7 +32,7 @@ &__VERSION__;. - 2010-2016Internet Systems Consortium, Inc. + 2010-2017Internet Systems Consortium, Inc. diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am index c37772263e..2858aefb00 100644 --- a/src/lib/cryptolink/Makefile.am +++ b/src/lib/cryptolink/Makefile.am @@ -21,6 +21,7 @@ if HAVE_OPENSSL libkea_cryptolink_la_SOURCES += openssl_link.cc libkea_cryptolink_la_SOURCES += openssl_common.h libkea_cryptolink_la_SOURCES += openssl_hash.cc +libkea_cryptolink_la_SOURCES += openssl_compat.h libkea_cryptolink_la_SOURCES += openssl_hmac.cc endif diff --git a/src/lib/dhcpsrv/hosts_messages.mes b/src/lib/dhcpsrv/hosts_messages.mes index 376386800a..f05e8f134a 100644 --- a/src/lib/dhcpsrv/hosts_messages.mes +++ b/src/lib/dhcpsrv/hosts_messages.mes @@ -160,20 +160,6 @@ identifier. This debug message is issued when no host was found using the specified subnet id and host identifier. -% HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER get one host with IPv6 reservation for subnet id %1, identified by %2 -This debug message is issued when starting to retrieve a host holding -IPv4 reservation, which is connected to a specific subnet and -is identified by a specific unique identifier. - -% HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_HOST using subnet id %1 and identifier %2, found host: %3 -This debug message includes the details of a host returned by an -alternate hosts data source using a subnet id and specific host -identifier. - -% HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_NULL host not found using subnet id %1 and identifier %2 -This debug message is issued when no host was found using the specified -subnet id and host identifier. - % HOSTS_MGR_ALTERNATE_GET6_PREFIX trying alternate source for host using prefix %1/%2 This debug message is issued when the Host Manager doesn't find the host connected to the specific subnet and having the reservation for @@ -191,3 +177,17 @@ This debug message is issued when the Host Manager doesn't find the host connected to the specific subnet and identified by the specified DUID or HW Address, and it is starting to search for this host in the alternate host data source. + +% HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER get one host with IPv6 reservation for subnet id %1, identified by %2 +This debug message is issued when starting to retrieve a host holding +IPv4 reservation, which is connected to a specific subnet and +is identified by a specific unique identifier. + +% HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_HOST using subnet id %1 and identifier %2, found host: %3 +This debug message includes the details of a host returned by an +alternate hosts data source using a subnet id and specific host +identifier. + +% HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_NULL host not found using subnet id %1 and identifier %2 +This debug message is issued when no host was found using the specified +subnet id and host identifier. -- 2.47.2