s4:kdc: samba_kdc_update_pac() doesn't need explicit delegated_proxy_principal

It comes along as delegated_proxy.pac_princ now.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index fafa2b10e1598b259320a9b9ac7a07db7836773c..4f97b8299190ae69a99a14f9e8bdf0b5dce0f54f 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -608,7 +608,6 @@ krb5_error_code mit_samba_update_pac(struct mit_samba_context *ctx,
                                    client_pac_entry,
                                    server->princ,
                                    server_skdc_entry,
-                                   NULL /* delegated_proxy_principal */,
                                    (struct samba_kdc_entry_pac) {} /* delegated_proxy */,
                                    (struct samba_kdc_entry_pac) {} /* device */,
                                    new_pac,

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 6adbbc9887f402405a7e0135148a3a7c48cae518..597fd8f7c997f382954e5f578f8afffe0b0fb340 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -2750,10 +2750,6 @@ krb5_error_code samba_kdc_get_pac(TALLOC_CTX *mem_ctx,
  *
  * @param server    The server samba kdc entry.
  *
- * @param delegated_proxy_principal The delegated proxy principal used for
- *                                  updating the constrained delegation PAC
- *                                  buffer.
- *
  * @param delegated_proxy   The delegated proxy kdc PAC entry.
  *
  * @param device    The computer's samba kdc PAC entry; used for compound
@@ -2771,7 +2767,6 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx,
                                     const struct samba_kdc_entry_pac client,
                                     const krb5_const_principal server_principal,
                                     const struct samba_kdc_entry *server,
-                                    const krb5_const_principal delegated_proxy_principal,
                                     const struct samba_kdc_entry_pac delegated_proxy,
                                     const struct samba_kdc_entry_pac device,
                                     krb5_pac new_pac,
@@ -2785,6 +2780,7 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx,
        DATA_BLOB *upn_blob = NULL;
        DATA_BLOB *deleg_blob = NULL;
        DATA_BLOB *requester_sid_blob = NULL;
+       krb5_const_principal delegated_proxy_principal = delegated_proxy.pac_princ;
        const DATA_BLOB *client_claims_blob = NULL;
        const DATA_BLOB *device_claims_blob = NULL;
        struct auth_claims pac_claims = {};

diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index 4d5643dff95002024d25d5b50c905fd865b095fd..6acaf8e9f3cf06172734df15c59c57ac5941f98a 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -128,7 +128,6 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx,
                                     const struct samba_kdc_entry_pac client,
                                     const krb5_const_principal server_principal,
                                     const struct samba_kdc_entry *server,
-                                    const krb5_const_principal delegated_proxy_principal,
                                     const struct samba_kdc_entry_pac delegated_proxy,
                                     const struct samba_kdc_entry_pac device,
                                     krb5_pac new_pac,

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 7d2e421097c2aa4682df97db44196d78fff5872d..c6ac2c739cb939e782fcc1ce92e1767c79c72218 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -361,7 +361,6 @@ static krb5_error_code samba_wdc_reget_pac(void *priv, astgs_request_t r,
                                   client_pac_entry,
                                   server->principal,
                                   server_skdc_entry,
-                                  delegated_proxy_principal,
                                   delegated_proxy_pac_entry,
                                   device,
                                   new_pac,