Author: truckman
Date: Mon May 23 05:11:08 2016
New Revision: 300453
URL: https://svnweb.freebsd.org/changeset/base/300453
Log:
MFC r299926
Hoist the getpwnam() call outside the first if/else block in
pam_sm_chauthtok(). Set user = getlogin() inside the true
branch so that it is initialized for the following PAM_LOG()
call. This is how it is done in pam_sm_authenticate().
Reported by: Coverity
CID: 272498
Modified:
stable/10/lib/libpam/modules/pam_unix/pam_unix.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libpam/modules/pam_unix/pam_unix.c
==============================================================================
--- stable/10/lib/libpam/modules/pam_unix/pam_unix.c Mon May 23 05:07:13
2016 (r300452)
+++ stable/10/lib/libpam/modules/pam_unix/pam_unix.c Mon May 23 05:11:08
2016 (r300453)
@@ -278,13 +278,13 @@ pam_sm_chauthtok(pam_handle_t *pamh, int
int pfd, tfd, retval;
if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF))
- pwd = getpwnam(getlogin());
+ user = getlogin();
else {
retval = pam_get_user(pamh, &user, NULL);
if (retval != PAM_SUCCESS)
return (retval);
- pwd = getpwnam(user);
}
+ pwd = getpwnam(user);
if (pwd == NULL)
return (PAM_AUTHTOK_RECOVERY_ERR);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
