From 3937fd1493dd4564d520e9aab5d8ee58a7b1c56a Mon Sep 17 00:00:00 2001 From: delphij Date: Mon, 17 Jul 2017 06:37:46 +0000 Subject: [PATCH] MFC r320433: Use strlcpy() instead of strncpy() and nul-terminating. git-svn-id: svn://svn.freebsd.org/base/stable/10@321069 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/rshd/rshd.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 7cdacae74..c84c154e4 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -322,8 +322,7 @@ doit(struct sockaddr *fromp) pam_err = pam_authenticate(pamh, 0); if (pam_err == PAM_SUCCESS) { if ((pam_err = pam_get_user(pamh, &cp, NULL)) == PAM_SUCCESS) { - strncpy(luser, cp, sizeof(luser)); - luser[sizeof(luser) - 1] = '\0'; + strlcpy(luser, cp, sizeof(luser)); /* XXX truncation! */ } pam_err = pam_acct_mgmt(pamh, 0); @@ -364,9 +363,7 @@ doit(struct sockaddr *fromp) if (lc != NULL && fromp->sa_family == AF_INET) { /*XXX*/ char remote_ip[MAXHOSTNAMELEN]; - strncpy(remote_ip, numericname, - sizeof(remote_ip) - 1); - remote_ip[sizeof(remote_ip) - 1] = 0; + strlcpy(remote_ip, numericname, sizeof(remote_ip)); /* XXX truncation! */ if (!auth_hostok(lc, rhost, remote_ip)) { syslog(LOG_INFO|LOG_AUTH, -- 2.42.0