diff options
| author | delphij <delphij@FreeBSD.org> | 2017-07-17 06:36:42 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2017-07-17 06:36:42 +0000 |
| commit | e5664d72f145bd6355e8a9f8c145fef220020971 (patch) | |
| tree | 18e5d36aed6d6aece32933fc64b19abe5ddf5f72 | |
| parent | abaa57fce56865a59f66a90020f805fedf8ef351 (diff) | |
| download | FreeBSD-src-e5664d72f145bd6355e8a9f8c145fef220020971.zip FreeBSD-src-e5664d72f145bd6355e8a9f8c145fef220020971.tar.gz | |
MFC r320433:
Use strlcpy() instead of strncpy() and nul-terminating.
| -rw-r--r-- | libexec/rshd/rshd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 1ab8a54..c563309 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -338,8 +338,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); @@ -386,9 +385,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, |
