The branch, master has been updated via 0529b59 s3-winbind: Do not delete an existing valid credential cache. from 940395d smbd: Fix a 100% loop at shutdown time
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0529b59fbe3f96509893fc4e93a75d6928b5a532 Author: Andreas Schneider <a...@samba.org> Date: Thu Jul 11 13:44:53 2013 +0200 s3-winbind: Do not delete an existing valid credential cache. BUG: https://bugzilla.samba.org/show_bug.cgi?id=9994 Thanks to David Woodhouse <dw...@infradead.org>. Reviewed-by: Günther Deschner <g...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Mon Jul 15 12:48:46 CEST 2013 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/winbindd/winbindd_pam.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 158a7c4..aed4741 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -685,6 +685,14 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; failed: + /* + * Do not delete an existing valid credential cache, if the user + * e.g. enters a wrong password + */ + if ((strequal(krb5_cc_type, "FILE") || strequal(krb5_cc_type, "WRFILE")) + && user_ccache_file != NULL) { + return result; + } /* we could have created a new credential cache with a valid tgt in it * but we werent able to get or verify the service ticket for this -- Samba Shared Repository