Attachment 18369 Details for Bug 15676 – Patch for v4-20-test

Patch for v4-20-test

bfixes-tmp420.txt (text/plain), 2.31 KB, created by Stefan Metzmacher on 2024-07-09 11:08:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2024-07-09 11:08:05 UTC

Size: 2.31 KB

patch

obsolete

>From 30a35d78eb4459405fa979b3211b80e9904a3ead Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 4 Jul 2024 18:00:52 +0200
>Subject: [PATCH] third_party/heimdal: Import lorikeet-heimdal-202407041740
> (commit 42ba2a6e5dd1bc14a8b5ada8c9b8ace85956f6a0)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Fix clock skew error message and memory cache clock skew recovery
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15676
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Fri Jul  5 10:02:26 UTC 2024 on atb-devel-224
>
>(cherry picked from commit e4d6a19e49260af22bffd2a417119489719ba364)
>---
> third_party/heimdal/lib/krb5/fast.c   | 12 ++++++++----
> third_party/heimdal/lib/krb5/mcache.c |  2 +-
> 2 files changed, 9 insertions(+), 5 deletions(-)
>
>diff --git a/third_party/heimdal/lib/krb5/fast.c b/third_party/heimdal/lib/krb5/fast.c
>index 90133a7abc0e..4026ed623276 100644
>--- a/third_party/heimdal/lib/krb5/fast.c
>+++ b/third_party/heimdal/lib/krb5/fast.c
>@@ -691,10 +691,14 @@ _krb5_fast_unwrap_error(krb5_context context,
>     idx = 0;
>     pa = krb5_find_padata(md->val, md->len, KRB5_PADATA_FX_FAST, &idx);
>     if (pa == NULL) {
>-	ret = KRB5_KDCREP_MODIFIED;
>-	krb5_set_error_message(context, ret,
>-			       N_("FAST fast response is missing FX-FAST", ""));
>-	goto out;
>+	/*
>+	 * Typically _krb5_fast_wrap_req() has set KRB5_FAST_EXPECTED, which
>+	 * means check_fast() will complain and return KRB5KRB_AP_ERR_MODIFIED.
>+	 *
>+	 * But for TGS-REP init_tgs_req() clears KRB5_FAST_EXPECTED and we'll
>+	 * ignore a missing KRB5_PADATA_FX_FAST.
>+	 */
>+	return check_fast(context, state);
>     }
> 
>     ret = unwrap_fast_rep(context, state, pa, &fastrep);
>diff --git a/third_party/heimdal/lib/krb5/mcache.c b/third_party/heimdal/lib/krb5/mcache.c
>index fdd5674c3b87..e916bf4e6be3 100644
>--- a/third_party/heimdal/lib/krb5/mcache.c
>+++ b/third_party/heimdal/lib/krb5/mcache.c
>@@ -225,7 +225,7 @@ mcc_initialize(krb5_context context,
>      */
>     mcc_destroy_internal(context, m);
>     m->dead = 0;
>-    m->kdc_offset = 0;
>+    m->kdc_offset = context->kdc_sec_offset;
>     m->mtime = time(NULL);
>     ret = krb5_copy_principal (context,
> 			       primary_principal,
>-- 
>2.34.1
>

Flags:

jsutton: review+

Actions: View

Attachments on bug 15676: 18369 | 18370