diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
commit | 59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch) | |
tree | 5910d4a840352aafbf67e8a39fa63936e5529b26 /auth-pam.c | |
parent | 07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff) | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) |
* New upstream release.
* Update to GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
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) | |||
602 | return; | 602 | return; |
603 | debug("PAM: cleanup"); | 603 | debug("PAM: cleanup"); |
604 | pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); | 604 | pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); |
605 | if (sshpam_cred_established) { | ||
606 | debug("PAM: deleting credentials"); | ||
607 | pam_setcred(sshpam_handle, PAM_DELETE_CRED); | ||
608 | sshpam_cred_established = 0; | ||
609 | } | ||
610 | if (sshpam_session_open) { | 605 | if (sshpam_session_open) { |
611 | debug("PAM: closing session"); | 606 | debug("PAM: closing session"); |
612 | pam_close_session(sshpam_handle, PAM_SILENT); | 607 | pam_close_session(sshpam_handle, PAM_SILENT); |
613 | sshpam_session_open = 0; | 608 | sshpam_session_open = 0; |
614 | } | 609 | } |
610 | if (sshpam_cred_established) { | ||
611 | debug("PAM: deleting credentials"); | ||
612 | pam_setcred(sshpam_handle, PAM_DELETE_CRED); | ||
613 | sshpam_cred_established = 0; | ||
614 | } | ||
615 | sshpam_authenticated = 0; | 615 | sshpam_authenticated = 0; |
616 | pam_end(sshpam_handle, sshpam_err); | 616 | pam_end(sshpam_handle, sshpam_err); |
617 | sshpam_handle = NULL; | 617 | sshpam_handle = NULL; |