BIND 10 master, updated. 5420c8bb51bd1a054df1962f86b34b6b0d4f4eb4 [master] Second merge of branch 'trac3084'
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Sep 2 08:23:39 UTC 2013
The branch, master has been updated
via 5420c8bb51bd1a054df1962f86b34b6b0d4f4eb4 (commit)
via 9da302197f39067d372cee065894e21303ad1034 (commit)
via 7feab5bbe65b961ba416e21a280b442246666a07 (commit)
from ba447c41b65a93c34f12fcb30f07352e12b16793 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5420c8bb51bd1a054df1962f86b34b6b0d4f4eb4
Merge: ba447c4 9da3021
Author: Marcin Siodelski <marcin at isc.org>
Date: Mon Sep 2 10:14:03 2013 +0200
[master] Second merge of branch 'trac3084'
By mistake, the previous merge was missing the changes which addressed
review comments.
-----------------------------------------------------------------------
Summary of changes:
src/lib/dhcp_ddns/Makefile.am | 1 +
src/lib/dhcpsrv/mysql_lease_mgr.cc | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index c0d8a7d..546a982 100644
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -39,6 +39,7 @@ libb10_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
libb10_dhcp_ddns_la_LDFLAGS = $(AM_LDFLAGS)
libb10_dhcp_ddns_la_LDFLAGS += ${BOTAN_LDFLAGS}
libb10_dhcp_ddns_la_LIBADD =
+libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la
libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index 2a6ad90..7d4ac1d 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -300,9 +300,11 @@ public:
///
/// The initialization of the variables here is only to satisfy cppcheck -
/// all variables are initialized/set in the methods before they are used.
- MySqlLease4Exchange() : addr4_(0), hwaddr_length_(0), client_id_length_(0) {
+ MySqlLease4Exchange() : addr4_(0), hwaddr_length_(0), client_id_length_(0),
+ fqdn_fwd_(false), fqdn_rev_(false), hostname_length_(0) {
memset(hwaddr_buffer_, 0, sizeof(hwaddr_buffer_));
memset(client_id_buffer_, 0, sizeof(client_id_buffer_));
+ memset(hostname_buffer_, 0, sizeof(hostname_buffer_));
std::fill(&error_[0], &error_[LEASE_COLUMNS], MLM_FALSE);
// Set the column names (for error messages)
@@ -649,9 +651,12 @@ public:
///
/// The initialization of the variables here is nonly to satisfy cppcheck -
/// all variables are initialized/set in the methods before they are used.
- MySqlLease6Exchange() : addr6_length_(0), duid_length_(0) {
+ MySqlLease6Exchange() : addr6_length_(0), duid_length_(0),
+ fqdn_fwd_(false), fqdn_rev_(false),
+ hostname_length_(0) {
memset(addr6_buffer_, 0, sizeof(addr6_buffer_));
memset(duid_buffer_, 0, sizeof(duid_buffer_));
+ memset(hostname_buffer_, 0, sizeof(hostname_buffer_));
std::fill(&error_[0], &error_[LEASE_COLUMNS], MLM_FALSE);
// Set the column names (for error messages)
More information about the bind10-changes
mailing list