Merge pull request #164 from malahal/strlcpy

Convert unsafe strncpy to strlcpy

Author: dang

src/clnt_perror.c

@@ -72,7 +72,7 @@ rpc_sperror(const struct rpc_err *e, const char *s)
 		len -= i;
 	}
 
-	(void)strncpy(str, clnt_sperrno(e->re_status), len - 1);
+	(void)strlcpy(str, clnt_sperrno(e->re_status), len);
 	i = strlen(str);
 	str += i;
 	len -= i;

src/netnamer.c

@@ -190,7 +190,7 @@ int netname2host(char netname[MAXNETNAMELEN + 1], char *hostname, int hostlen)
 	if (getnetid(netname, valbuf)) {
 		val = valbuf;
 		if ((*val == '0') && (val[1] == ':')) {
-			(void)strncpy(hostname, val + 2, hostlen);
+			(void)strlcpy(hostname, val + 2, hostlen);
 			return (1);
 		}
 	}

src/rpc_generic.c

@@ -957,7 +957,7 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr)
 		sun = (struct sockaddr_un *)mem_zalloc(sizeof(*sun));
 
 		sun->sun_family = AF_LOCAL;
-		strncpy(sun->sun_path, addrstr, sizeof(sun->sun_path) - 1);
+		strlcpy(sun->sun_path, addrstr, sizeof(sun->sun_path));
 		ret->len = SUN_LEN(sun);
 		ret->maxlen = sizeof(struct sockaddr_un);
 		ret->buf = sun;

src/rpcb_clnt.c

@@ -338,7 +338,7 @@ static CLIENT *getclnthandle(const char *host, const struct netconfig *nconf,
 
 			if (targaddr) {
 				*targaddr = mem_zalloc(sizeof(sun.sun_path));
-				strncpy(*targaddr, _PATH_RPCBINDSOCK,
+				strlcpy(*targaddr, _PATH_RPCBINDSOCK,
 					sizeof(sun.sun_path));
 			}
 			return (client);
@@ -598,7 +598,7 @@ __rpcbind_is_up(void)
 	if (sock < 0)
 		return (false);
 	sun.sun_family = AF_LOCAL;
-	strncpy(sun.sun_path, _PATH_RPCBINDSOCK, sizeof(sun.sun_path));
+	strlcpy(sun.sun_path, _PATH_RPCBINDSOCK, sizeof(sun.sun_path));
 
 	if (connect(sock, (struct sockaddr *)&sun, sizeof(sun)) < 0) {
 		close(sock);