diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-07-12 14:07:21 +0200 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-07-12 14:07:21 +0200 |
commit | 622d5c561bf940c0c2d329d8001ca1e60b862ca2 (patch) | |
tree | 686f7ba9b7f52e54983b26b6e028c5e6fa97faee /auth-pam.c | |
parent | - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch (diff) | |
download | openssh-622d5c561bf940c0c2d329d8001ca1e60b862ca2.tar.xz openssh-622d5c561bf940c0c2d329d8001ca1e60b862ca2.zip |
- (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
logout to after the session close. Patch from Anicka Bernathova, ok djm.
Diffstat (limited to 'auth-pam.c')
-rw-r--r-- | auth-pam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auth-pam.c b/auth-pam.c index ccdb9937e..675006e6f 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -602,16 +602,16 @@ sshpam_cleanup(void) return; debug("PAM: cleanup"); pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); - if (sshpam_cred_established) { - debug("PAM: deleting credentials"); - pam_setcred(sshpam_handle, PAM_DELETE_CRED); - sshpam_cred_established = 0; - } if (sshpam_session_open) { debug("PAM: closing session"); pam_close_session(sshpam_handle, PAM_SILENT); sshpam_session_open = 0; } + if (sshpam_cred_established) { + debug("PAM: deleting credentials"); + pam_setcred(sshpam_handle, PAM_DELETE_CRED); + sshpam_cred_established = 0; + } sshpam_authenticated = 0; pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; |