1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00

third_party/heimdal: Import lorikeet-heimdal-202407041740 (commit 42ba2a6e5dd1bc14a8b5ada8c9b8ace85956f6a0)

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

Autobuild-User(v4-20-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-20-test): Wed Jul 10 09:14:10 UTC 2024 on atb-devel-224
This commit is contained in:
Ralph Boehme 2024-07-04 18:00:52 +02:00 committed by Jule Anger
parent 16b430e740
commit f4604a86fe
2 changed files with 9 additions and 5 deletions

View File

@ -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);

View File

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