svn commit: r321069 - stable/10/libexec/rshd
Xin LI
delphij at FreeBSD.org
Mon Jul 17 06:37:48 UTC 2017
Author: delphij
Date: Mon Jul 17 06:37:46 2017
New Revision: 321069
URL: https://svnweb.freebsd.org/changeset/base/321069
Log:
MFC r320433:
Use strlcpy() instead of strncpy() and nul-terminating.
Modified:
stable/10/libexec/rshd/rshd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/rshd/rshd.c
==============================================================================
--- stable/10/libexec/rshd/rshd.c Mon Jul 17 06:36:42 2017 (r321068)
+++ stable/10/libexec/rshd/rshd.c Mon Jul 17 06:37:46 2017 (r321069)
@@ -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,
More information about the svn-src-all
mailing list