From eb36da19e7615d81e773401ba169782994e583b1 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 10 Feb 2015 14:03:27 -0800
Subject: [PATCH] [v9_10] address valgrind warnings

4059.	[bug]		Addressed valgrind warnings. [RT #38549]
---
 CHANGES                  | 2 ++
 bin/named/interfacemgr.c | 2 +-
 bin/named/server.c       | 4 ++--
 lib/isc/unix/net.c       | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8683c5bec5..4c295fa240 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4059.	[bug]		Addressed valgrind warnings. [RT #38549]
+
 4058.	[bug]		UDP dispatches could use the wrong psuedorandom
 			number generator context. [RT #38578]
 
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index 914d2994ec..6330ee30f6 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -1039,7 +1039,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 				if (le->dscp != -1 && ifp->dscp == -1)
 					ifp->dscp = le->dscp;
 				else if (le->dscp != ifp->dscp) {
-					isc_sockaddr_format(&listen_addr,
+					isc_sockaddr_format(&listen_sockaddr,
 							    sabuf,
 							    sizeof(sabuf));
 					isc_log_write(IFMGR_COMMON_LOGARGS,
diff --git a/bin/named/server.c b/bin/named/server.c
index e7cc327cef..258752d0e8 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9339,7 +9339,7 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
 	isc_boolean_t first = ISC_TRUE;
 	isc_boolean_t list = ISC_FALSE, clear = ISC_FALSE;
 	isc_boolean_t chain = ISC_FALSE;
-	char keystr[DNS_SECALG_FORMATSIZE + 7];
+	char keystr[DNS_SECALG_FORMATSIZE + 7]; /* <5-digit keyid>/<alg> */
 	unsigned short hash = 0, flags = 0, iter = 0, saltlen = 0;
 	unsigned char salt[255];
 	const char *ptr;
@@ -9365,7 +9365,7 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
 		ptr = next_token(&args, " \t");
 		if (ptr == NULL)
 			return (ISC_R_UNEXPECTEDEND);
-		memmove(keystr, ptr, sizeof(keystr));
+		strlcpy(keystr, ptr, sizeof(keystr));
 	} else if (strcasecmp(ptr, "-nsec3param") == 0) {
 		const char *hashstr, *flagstr, *iterstr;
 		char nbuf[512];
diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index 0810e4a003..4b75594d16 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -519,6 +519,8 @@ cmsgsend(int s, int level, int type, struct addrinfo *res) {
 		return (ISC_FALSE);
 	}
 
+	memset(&control, 0, sizeof(control));
+
 	iovec.iov_base = buf;
 	iovec.iov_len = sizeof(buf);