s4:kdc: Adapt interface to new Heimdal revision

NOTE: This commit finally works again!

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

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index d1b3e3b6a83e68f8e9d430d8dbc1ac99b4795da7..9b92dcb18429e91bb4a96fd4e3b41a273cd551c4 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -318,9 +318,13 @@ hdb_samba4_check_constrained_delegation(krb5_context context, HDB *db,
 
 static krb5_error_code
 hdb_samba4_check_rbcd(krb5_context context, HDB *db,
-                     krb5_const_principal client_principal,
+                     const hdb_entry *client_krbtgt,
+                     const hdb_entry *client,
+                     const hdb_entry *device_krbtgt,
+                     const hdb_entry *device,
                      krb5_const_principal server_principal,
                      krb5_const_pac header_pac,
+                     krb5_const_pac device_pac,
                      const hdb_entry *proxy)
 {
        struct samba_kdc_db_context *kdc_db_ctx = NULL;
@@ -333,7 +337,7 @@ hdb_samba4_check_rbcd(krb5_context context, HDB *db,
 
        return samba_kdc_check_s4u2proxy_rbcd(context,
                                              kdc_db_ctx,
-                                             client_principal,
+                                             client->principal,
                                              server_principal,
                                              header_pac,
                                              proxy_skdc_entry);

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index ccce5a41363846d22a6c4050a9c8baf814e3061e..1daf6d63f518f28129f4a3ad7d3b170636cec80b 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -341,8 +341,7 @@ static krb5_error_code samba_wdc_verify_pac2(astgs_request_t r,
                                             const hdb_entry *client,
                                             const hdb_entry *krbtgt,
                                             const krb5_pac pac,
-                                            krb5_cksumtype ctype,
-                                            krb5_boolean *is_trusted_out)
+                                            krb5_cksumtype ctype)
 {
        krb5_context context = kdc_request_get_context((kdc_request_t)r);
        struct samba_kdc_entry *client_skdc_entry = NULL;
@@ -450,10 +449,6 @@ static krb5_error_code samba_wdc_verify_pac2(astgs_request_t r,
                goto out;
        }
 
-       if (is_trusted_out != NULL) {
-               *is_trusted_out = is_trusted;
-       }
-
 out:
        talloc_free(mem_ctx);
        return ret;
@@ -587,8 +582,7 @@ static krb5_error_code samba_wdc_verify_pac(void *priv, astgs_request_t r,
                                            hdb_entry *_server,
                                            hdb_entry *krbtgt,
                                            EncTicketPart *ticket,
-                                           krb5_pac pac,
-                                           krb5_boolean *is_trusted)
+                                           krb5_pac pac)
 {
        krb5_context context = kdc_request_get_context((kdc_request_t)r);
        krb5_kdc_configuration *config = kdc_request_get_config((kdc_request_t)r);
@@ -719,8 +713,7 @@ static krb5_error_code samba_wdc_verify_pac(void *priv, astgs_request_t r,
                                    client,
                                    krbtgt,
                                    pac,
-                                   ctype,
-                                   is_trusted);
+                                   ctype);
 
        if (krbtgt == &signing_krbtgt_hdb) {
                hdb_free_entry(context, config->db[0], &signing_krbtgt_hdb);