diff options
| author | Günther Deschner <gd@samba.org> | 2006-12-14 16:34:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:29 -0500 |
| commit | 3ff4f4410ff71fc4c74b7546d0c0002918a32cf3 (patch) | |
| tree | 1563929d11f33cb72d661b81789fdc1cd5a47978 /source3/nsswitch/winbindd_pam.c | |
| parent | d879aa8f3617b256a16889d04a39a25b27f5bb39 (diff) | |
| download | samba-3ff4f4410ff71fc4c74b7546d0c0002918a32cf3.tar.gz samba-3ff4f4410ff71fc4c74b7546d0c0002918a32cf3.tar.bz2 samba-3ff4f4410ff71fc4c74b7546d0c0002918a32cf3.zip | |
r20171: Don't delete the krb5 credential if others still reference to it.
Guenther
(This used to be commit a1378979be4fe5ac5148b0a7830859aebb97838c)
Diffstat (limited to 'source3/nsswitch/winbindd_pam.c')
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 6a13b38b3a..257008497b 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -1976,9 +1976,6 @@ enum winbindd_result winbindd_dual_pam_logoff(struct winbindd_domain *domain, struct winbindd_cli_state *state) { NTSTATUS result = NT_STATUS_NOT_SUPPORTED; -#ifdef HAVE_KRB5 - int ret; -#endif DEBUG(3, ("[%5lu]: pam dual logoff %s\n", (unsigned long)state->pid, state->request.data.logoff.user)); @@ -2010,19 +2007,13 @@ enum winbindd_result winbindd_dual_pam_logoff(struct winbindd_domain *domain, goto process_result; } - ret = ads_kdestroy(state->request.data.logoff.krb5ccname); - - if (ret) { - DEBUG(0,("winbindd_pam_logoff: failed to destroy user ccache %s with: %s\n", - state->request.data.logoff.krb5ccname, error_message(ret))); - } else { - DEBUG(10,("winbindd_pam_logoff: successfully destroyed ccache %s for user %s\n", - state->request.data.logoff.krb5ccname, state->request.data.logoff.user)); + result = remove_ccache(state->request.data.logoff.user); + if (!NT_STATUS_IS_OK(result)) { + DEBUG(0,("winbindd_pam_logoff: failed to remove ccache: %s\n", + nt_errstr(result))); + goto process_result; } - remove_ccache(state->request.data.logoff.user); - - result = krb5_to_nt_status(ret); #else result = NT_STATUS_NOT_SUPPORTED; #endif |