[30847] in CVS-changelog-for-Kerberos-V5
krb5 commit: Suppress Leash error popup on MSLSA renew failure
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Sep 7 12:16:54 2020
Date: Mon, 7 Sep 2020 12:16:40 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-ID: <202009071616.087GGeIu001531@drugstore.mit.edu>
To: <cvs-krb5@mit.edu>
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/bfd407703a938573610af3f17aad4d5ebad615fd
commit bfd407703a938573610af3f17aad4d5ebad615fd
Author: Greg Hudson <ghudson@mit.edu>
Date: Wed Aug 19 11:49:29 2020 -0400
Suppress Leash error popup on MSLSA renew failure
Attempting to renew the MSLSA cache can commonly fail with
KRB5_CC_NOTFOUND due to LSA policy. Do not display an error popup in
this case. Also fix a logic error in the existing suppressions.
ticket: 8939 (new)
tags: pullup
target_version: 1.18-next
target_version: 1.17-next
src/windows/leashdll/krb5routines.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/windows/leashdll/krb5routines.c b/src/windows/leashdll/krb5routines.c
index ff4f360..587f044 100644
--- a/src/windows/leashdll/krb5routines.c
+++ b/src/windows/leashdll/krb5routines.c
@@ -121,8 +121,8 @@ LeashKRB5_renew(void)
code = pkrb5_get_renewed_creds(ctx, &my_creds, me, cc, NULL);
pkrb5_cc_set_flags(ctx, cc, KRB5_TC_NOTICKET);
if (code) {
- if ( code != KRB5KDC_ERR_ETYPE_NOSUPP ||
- code != KRB5_KDC_UNREACH)
+ if (code != KRB5KDC_ERR_ETYPE_NOSUPP && code != KRB5_KDC_UNREACH &&
+ code != KRB5_CC_NOTFOUND)
Leash_krb5_error(code, "krb5_get_renewed_creds()", 0, &ctx, &cc);
goto cleanup;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
