Use strlcpy() instead of strncpy() and nul-terminating.
MFC after: 2 weeks
This commit is contained in:
parent
97e832c1da
commit
c1d2f02b32
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=320433
@ -338,8 +338,7 @@ doit(struct sockaddr *fromp)
|
|||||||
pam_err = pam_authenticate(pamh, 0);
|
pam_err = pam_authenticate(pamh, 0);
|
||||||
if (pam_err == PAM_SUCCESS) {
|
if (pam_err == PAM_SUCCESS) {
|
||||||
if ((pam_err = pam_get_user(pamh, &cp, NULL)) == PAM_SUCCESS) {
|
if ((pam_err = pam_get_user(pamh, &cp, NULL)) == PAM_SUCCESS) {
|
||||||
strncpy(luser, cp, sizeof(luser));
|
strlcpy(luser, cp, sizeof(luser));
|
||||||
luser[sizeof(luser) - 1] = '\0';
|
|
||||||
/* XXX truncation! */
|
/* XXX truncation! */
|
||||||
}
|
}
|
||||||
pam_err = pam_acct_mgmt(pamh, 0);
|
pam_err = pam_acct_mgmt(pamh, 0);
|
||||||
@ -386,9 +385,7 @@ doit(struct sockaddr *fromp)
|
|||||||
if (lc != NULL && fromp->sa_family == AF_INET) { /*XXX*/
|
if (lc != NULL && fromp->sa_family == AF_INET) { /*XXX*/
|
||||||
char remote_ip[MAXHOSTNAMELEN];
|
char remote_ip[MAXHOSTNAMELEN];
|
||||||
|
|
||||||
strncpy(remote_ip, numericname,
|
strlcpy(remote_ip, numericname, sizeof(remote_ip));
|
||||||
sizeof(remote_ip) - 1);
|
|
||||||
remote_ip[sizeof(remote_ip) - 1] = 0;
|
|
||||||
/* XXX truncation! */
|
/* XXX truncation! */
|
||||||
if (!auth_hostok(lc, rhost, remote_ip)) {
|
if (!auth_hostok(lc, rhost, remote_ip)) {
|
||||||
syslog(LOG_INFO|LOG_AUTH,
|
syslog(LOG_INFO|LOG_AUTH,
|
||||||
|
Loading…
Reference in New Issue
Block a user