diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | auth-pam.c | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20131219 | 1 | 20131219 |
2 | - (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions | 2 | - (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions |
3 | greater than 11 either rather than just 11. Patch from Tomas Kuthan. | 3 | greater than 11 either rather than just 11. Patch from Tomas Kuthan. |
4 | - (dtucker) [auth-pam.c] bz#2163: check return value from pam_get_item(). | ||
5 | Patch from Loganaden Velvindron. | ||
4 | 6 | ||
5 | 20131218 | 7 | 20131218 |
6 | - (djm) OpenBSD CVS Sync | 8 | - (djm) OpenBSD CVS Sync |
diff --git a/auth-pam.c b/auth-pam.c index d51318b3a..d789bad7b 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -438,8 +438,10 @@ sshpam_thread(void *ctxtp) | |||
438 | const char **ptr_pam_user = &pam_user; | 438 | const char **ptr_pam_user = &pam_user; |
439 | char *tz = getenv("TZ"); | 439 | char *tz = getenv("TZ"); |
440 | 440 | ||
441 | pam_get_item(sshpam_handle, PAM_USER, | 441 | sshpam_err = pam_get_item(sshpam_handle, PAM_USER, |
442 | (sshpam_const void **)ptr_pam_user); | 442 | (sshpam_const void **)ptr_pam_user); |
443 | if (sshpam_err != PAM_SUCCESS) | ||
444 | goto auth_fail; | ||
443 | 445 | ||
444 | environ[0] = NULL; | 446 | environ[0] = NULL; |
445 | if (tz != NULL) | 447 | if (tz != NULL) |