From: Jo Sutton <josutton@catalyst.net.nz>
Date: Wed, 22 May 2024 04:07:17 +0000 (+1200)
Subject: third_party/heimdal: Import lorikeet-heimdal-202405220400 (commit 8276d6311146b8ab5d5... 
X-Git-Tag: tdb-1.4.11~583
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4597d3140299a2befe17c5b6627bd80a69aa204c;p=thirdparty%2Fsamba.git

third_party/heimdal: Import lorikeet-heimdal-202405220400 (commit 8276d6311146b8ab5d57d092bc5d5fa28282a900)

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/selftest/knownfail_heimdal_kdc b/selftest/knownfail_heimdal_kdc
index f4366462d79..9c83268b205 100644
--- a/selftest/knownfail_heimdal_kdc
+++ b/selftest/knownfail_heimdal_kdc
@@ -73,7 +73,6 @@
 #
 ^samba.tests.krb5.pkinit_tests.samba.tests.krb5.pkinit_tests.PkInitTests.test_pkinit_no_des3.ad_dc
 ^samba.tests.krb5.pkinit_tests.samba.tests.krb5.pkinit_tests.PkInitTests.test_pkinit_ntlm_from_pac_must_change_now
-^samba.tests.krb5.pkinit_tests.samba.tests.krb5.pkinit_tests.PkInitTests.test_pkinit_ntlm_from_pac_smartcard_required
 ^samba.tests.krb5.pkinit_tests.samba.tests.krb5.pkinit_tests.PkInitTests.test_pkinit_ntlm_from_pac_smartcard_required_must_change_now
 #
 # Windows 2000 PK-INIT tests
diff --git a/third_party/heimdal/kdc/Makefile.am b/third_party/heimdal/kdc/Makefile.am
index ca5835930dd..1d37680cdba 100644
--- a/third_party/heimdal/kdc/Makefile.am
+++ b/third_party/heimdal/kdc/Makefile.am
@@ -38,7 +38,7 @@ string2key_SOURCES = string2key.c headers.h
 
 if HAVE_MICROHTTPD
 bx509d_SOURCES = bx509d.c
-bx509d_AM_CPPFLAGS = $(AM_CPPFLAGS) $(MICROHTTPD_CFLAGS)
+bx509d_CPPFLAGS = $(AM_CPPFLAGS) $(MICROHTTPD_CFLAGS)
 bx509d_LDADD =	-ldl \
                  $(top_builddir)/lib/hdb/libhdb.la \
 		 libkdc.la \
@@ -54,7 +54,7 @@ bx509d_LDADD =	-ldl \
 libexec_PROGRAMS += bx509d
 
 httpkadmind_SOURCES = httpkadmind.c
-httpkadmind_AM_CPPFLAGS = $(AM_CPPFLAGS) $(MICROHTTPD_CFLAGS)
+httpkadmind_CPPFLAGS = $(AM_CPPFLAGS) $(MICROHTTPD_CFLAGS)
 httpkadmind_LDADD =	-ldl \
 		 $(top_builddir)/lib/hdb/libhdb.la \
 		 $(top_builddir)/lib/kadm5/libkadm5clnt.la \
diff --git a/third_party/heimdal/kdc/kerberos5.c b/third_party/heimdal/kdc/kerberos5.c
index 22f16e169d2..3d3243787f3 100644
--- a/third_party/heimdal/kdc/kerberos5.c
+++ b/third_party/heimdal/kdc/kerberos5.c
@@ -2692,7 +2692,7 @@ _kdc_as_rep(astgs_request_t r)
                     ret = _kdc_hwauth_policy(r);
                     if (ret) {
                         kdc_log(r->context, config, 4, "Hardware authentication required for %s", r->cname);
-                        return ret;
+                        goto out;
                     }
                 }
 		kdc_audit_addkv((kdc_request_t)r, KDC_AUDIT_VIS, "pa", "%s",