From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 19 Aug 2020 15:49:29 +0000 (-0400)
Subject: Suppress Leash error popup on MSLSA renew failure
X-Git-Tag: krb5-1.19-beta1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1104%2Fhead;p=thirdparty%2Fkrb5.git

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
---

diff --git a/src/windows/leashdll/krb5routines.c b/src/windows/leashdll/krb5routines.c
index ff4f360f63..587f044bda 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;
     }