From owner-svn-src-all@freebsd.org  Fri May 20 06:33:03 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6367CB381DA;
 Fri, 20 May 2016 06:33:03 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 304C810A5;
 Fri, 20 May 2016 06:33:03 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4K6X23t084711;
 Fri, 20 May 2016 06:33:02 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K6X2bG084710;
 Fri, 20 May 2016 06:33:02 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605200633.u4K6X2bG084710@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Fri, 20 May 2016 06:33:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r300271 - stable/10/usr.sbin/timed/timed
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 May 2016 06:33:03 -0000

Author: truckman
Date: Fri May 20 06:33:02 2016
New Revision: 300271
URL: https://svnweb.freebsd.org/changeset/base/300271

Log:
  MFC r299580
  
  Use strlcpy() instead of strncpy() to ensure that ret->name is
  NUL terminated.  The source and destination buffers are the same
  size and the source *should* be NUL terminated, but be paranoid.
  
  Reported by:	Coverity
  CID:		1011274

Modified:
  stable/10/usr.sbin/timed/timed/master.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/timed/timed/master.c
==============================================================================
--- stable/10/usr.sbin/timed/timed/master.c	Fri May 20 06:27:58 2016	(r300270)
+++ stable/10/usr.sbin/timed/timed/master.c	Fri May 20 06:33:02 2016	(r300271)
@@ -623,7 +623,7 @@ addmach(char *name, struct sockaddr_in *
 		}
 		ret->addr = *addr;
 		ret->ntp = ntp;
-		(void)strncpy(ret->name, name, sizeof(ret->name));
+		(void)strlcpy(ret->name, name, sizeof(ret->name));
 		ret->good = good_host_name(name);
 		ret->l_fwd = &self;
 		ret->l_bak = self.l_bak;