Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Apr 2012 07:42:18 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r233770 - head/lib/libc/net
Message-ID:  <201204020742.q327gIXH087093@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Mon Apr  2 07:42:17 2012
New Revision: 233770
URL: http://svn.freebsd.org/changeset/base/233770

Log:
  Eliminate two cases of unwanted strncpy().  The name is not required
  by the current code, and the results would get overwritten anyway
  by subsequent memset().
  
  Reviewed by:	ume
  MFC after:	1 month

Modified:
  head/lib/libc/net/getaddrinfo.c
  head/lib/libc/net/name6.c

Modified: head/lib/libc/net/getaddrinfo.c
==============================================================================
--- head/lib/libc/net/getaddrinfo.c	Mon Apr  2 07:18:31 2012	(r233769)
+++ head/lib/libc/net/getaddrinfo.c	Mon Apr  2 07:42:17 2012	(r233770)
@@ -847,8 +847,6 @@ set_source(struct ai_order *aio, struct 
 		struct in6_ifreq ifr6;
 		u_int32_t flags6;
 
-		/* XXX: interface name should not be hardcoded */
-		strncpy(ifr6.ifr_name, "lo0", sizeof(ifr6.ifr_name));
 		memset(&ifr6, 0, sizeof(ifr6));
 		memcpy(&ifr6.ifr_addr, ai.ai_addr, ai.ai_addrlen);
 		if (_ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) == 0) {

Modified: head/lib/libc/net/name6.c
==============================================================================
--- head/lib/libc/net/name6.c	Mon Apr  2 07:18:31 2012	(r233769)
+++ head/lib/libc/net/name6.c	Mon Apr  2 07:42:17 2012	(r233770)
@@ -884,8 +884,6 @@ set_source(struct hp_order *aio, struct 
 		struct in6_ifreq ifr6;
 		u_int32_t flags6;
 
-		/* XXX: interface name should not be hardcoded */
-		strncpy(ifr6.ifr_name, "lo0", sizeof(ifr6.ifr_name));
 		memset(&ifr6, 0, sizeof(ifr6));
 		memcpy(&ifr6.ifr_addr, &ss, ss.ss_len);
 		if (_ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) == 0) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204020742.q327gIXH087093>