From c12904ec531fb210066bafc33bde74d43889caac Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 21 Feb 2011 07:34:57 +0000
Subject: [PATCH] 3035.   [cleanup]       Simplify by using strlcpy. [RT
 #22521]

---
 CHANGES           | 2 ++
 bin/dig/dighost.c | 8 +++-----
 bin/dig/host.c    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index d882305648..ca8760acdc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3035.	[cleanup]	Simplify by using strlcpy. [RT #22521] 
+
 3034.	[cleanup]	nslookup: use strlcpy instead of safecopy. [RT #22521]
 
 3033.	[cleanup]	Add two INSIST(bucket != DNS_ADB_INVALIDBUCKET).
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index fc5e491ef5..54b2c0a209 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.336 2010/12/09 00:54:33 marka Exp $ */
+/* $Id: dighost.c,v 1.337 2011/02/21 07:34:56 marka Exp $ */
 
 /*! \file
  *  \note
@@ -566,10 +566,8 @@ make_server(const char *servname, const char *userarg) {
 	if (srv == NULL)
 		fatal("memory allocation failure in %s:%d",
 		      __FILE__, __LINE__);
-	strncpy(srv->servername, servname, MXNAME);
-	strncpy(srv->userarg, userarg, MXNAME);
-	srv->servername[MXNAME-1] = 0;
-	srv->userarg[MXNAME-1] = 0;
+	strlcpy(srv->servername, servname, MXNAME);
+	strlcpy(srv->userarg, userarg, MXNAME);
 	ISC_LINK_INIT(srv, link);
 	return (srv);
 }
diff --git a/bin/dig/host.c b/bin/dig/host.c
index d2ff52e088..7ef0e817d9 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.124 2010/11/16 05:38:30 marka Exp $ */
+/* $Id: host.c,v 1.125 2011/02/21 07:34:57 marka Exp $ */
 
 /*! \file */
 
@@ -824,8 +824,8 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
 	if (isc_commandline_index >= argc)
 		show_usage();
 
-	strncpy(hostname, argv[isc_commandline_index], sizeof(hostname));
-	hostname[sizeof(hostname)-1]=0;
+	strlcpy(hostname, argv[isc_commandline_index], sizeof(hostname));
+
 	if (argc > isc_commandline_index + 1) {
 		set_nameserver(argv[isc_commandline_index+1]);
 		debug("server is %s", argv[isc_commandline_index+1]);