third_party/heimdal: Import lorikeet-heimdal-202305172147 (commit dedb12e3db6e3e5b878...

NOTE: THIS COMMIT WON’T COMPILE/WORK ON ITS OWN!

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

diff --git a/third_party/heimdal/kdc/kdc-plugin.c b/third_party/heimdal/kdc/kdc-plugin.c
index c575d7df47986dcbcdd668516c85c7a699b3a5cc..cbb61b51fc2c1a7e8e9909019e69897d73a3a228 100644 (file)
--- a/third_party/heimdal/kdc/kdc-plugin.c
+++ b/third_party/heimdal/kdc/kdc-plugin.c
@@ -145,6 +145,7 @@ struct verify_uc {
     hdb_entry *client;
     hdb_entry *server;
     hdb_entry *krbtgt;
+    EncTicketPart *ticket;
     krb5_pac pac;
     krb5_boolean *is_trusted;
 };
@@ -163,7 +164,8 @@ verify(krb5_context context, const void *plug, void *plugctx, void *userctx)
                         uc->r,
                         uc->client_principal,
                         uc->delegated_proxy_principal,
-                        uc->client, uc->server, uc->krbtgt, uc->pac,
+                        uc->client, uc->server, uc->krbtgt,
+                        uc->ticket, uc->pac,
                         uc->is_trusted);
     return ret;
 }
@@ -175,6 +177,7 @@ _kdc_pac_verify(astgs_request_t r,
                hdb_entry *client,
                hdb_entry *server,
                hdb_entry *krbtgt,
+               EncTicketPart *ticket,
                krb5_pac pac,
                krb5_boolean *is_trusted)
 {
@@ -189,6 +192,7 @@ _kdc_pac_verify(astgs_request_t r,
     uc.client = client;
     uc.server = server;
     uc.krbtgt = krbtgt;
+    uc.ticket = ticket,
     uc.pac = pac;
     uc.is_trusted = is_trusted;
 

diff --git a/third_party/heimdal/kdc/kdc-plugin.h b/third_party/heimdal/kdc/kdc-plugin.h
index 4ec92a575b3ea8bc3489e38f03900a4dada8c16c..2e26d90137e654a58325d09701c16e7df159f60f 100644 (file)
--- a/third_party/heimdal/kdc/kdc-plugin.h
+++ b/third_party/heimdal/kdc/kdc-plugin.h
@@ -70,6 +70,7 @@ typedef krb5_error_code
                                           hdb_entry *,/* client */
                                           hdb_entry *,/* server */
                                           hdb_entry *,/* krbtgt */
+                                          EncTicketPart *, /* ticket */
                                           krb5_pac, /* pac */
                                           krb5_boolean *); /* is_trusted */
 

diff --git a/third_party/heimdal/kdc/krb5tgs.c b/third_party/heimdal/kdc/krb5tgs.c
index 1ded41616dc67826dae869742188fd3626c3a877..c3b033f58c25663dad1241f43e9a02871b360b13 100644 (file)
--- a/third_party/heimdal/kdc/krb5tgs.c
+++ b/third_party/heimdal/kdc/krb5tgs.c
@@ -126,7 +126,7 @@ _kdc_check_pac(astgs_request_t r,
     /* Verify the KDC signatures. */
     ret = _kdc_pac_verify(r,
                          client_principal, delegated_proxy_principal,
-                         client, server, krbtgt, pac, &is_trusted);
+                         client, server, krbtgt, tkt, pac, &is_trusted);
     if (ret == 0) {
        if (is_trusted) {
            krb5_pac_set_trusted(pac, true);