From: Andrew Bartlett Date: Wed, 1 Dec 2021 22:34:24 +0000 (+1300) Subject: s4:kdc: Adapt to use new combined windc interface in lorikeet-heimdal X-Git-Tag: tdb-1.4.6~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d8edb7b768578816b68c41aef0aae4222cb0b11;p=thirdparty%2Fsamba.git s4:kdc: Adapt to use new combined windc interface in lorikeet-heimdal This interface is as requested by Luke Howard towards possibly merging this feature. NOTE: THIS COMMIT WON'T COMPILE/WORK ON ITS OWN! Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c index 5552297fd96..c1e8780f5d3 100644 --- a/source4/kdc/wdc-samba4.c +++ b/source4/kdc/wdc-samba4.c @@ -109,15 +109,6 @@ static krb5_error_code samba_wdc_get_pac(void *priv, krb5_context context, return ret; } -static krb5_error_code samba_wdc_get_pac_compat(void *priv, krb5_context context, - struct hdb_entry_ex *client, - struct hdb_entry_ex *server, - const krb5_boolean *pac_request, - krb5_pac *pac) -{ - return samba_wdc_get_pac(priv, context, client, server, NULL, pac_request, pac); -} - static krb5_error_code samba_wdc_reget_pac2(krb5_context context, const krb5_principal delegated_proxy_principal, struct hdb_entry_ex *client, @@ -905,10 +896,9 @@ struct krb5plugin_windc_ftable windc_plugin_table = { .minor_version = KRB5_WINDC_PLUGIN_MINOR, .init = samba_wdc_plugin_init, .fini = samba_wdc_plugin_fini, - .pac_generate = samba_wdc_get_pac_compat, .pac_verify = samba_wdc_reget_pac, .client_access = samba_wdc_check_client_access, - .pac_pk_generate = samba_wdc_get_pac, + .pac_generate = samba_wdc_get_pac, };