From 2ac297562fe5c4a49db45b26bee602f42477d10a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 29 Aug 2016 11:59:18 +0200 Subject: [PATCH 1/1] krb5_wrap: Rename kerberos_kinit_s4u2_cc() Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- lib/krb5_wrap/krb5_samba.c | 20 ++++++++++---------- lib/krb5_wrap/krb5_samba.h | 20 ++++++++++---------- source4/auth/kerberos/kerberos_util.c | 16 ++++++++++------ 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 130a11be273..e21a79f4f4c 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1913,16 +1913,16 @@ done: kpasswd/realm or a remote service (for S4U2Proxy) */ -krb5_error_code kerberos_kinit_s4u2_cc(krb5_context ctx, - krb5_ccache store_cc, - krb5_principal init_principal, - const char *init_password, - krb5_principal impersonate_principal, - const char *self_service, - const char *target_service, - krb5_get_init_creds_opt *krb_options, - time_t *expire_time, - time_t *kdc_time) +krb5_error_code smb_krb5_kinit_s4u2_ccache(krb5_context ctx, + krb5_ccache store_cc, + krb5_principal init_principal, + const char *init_password, + krb5_principal impersonate_principal, + const char *self_service, + const char *target_service, + krb5_get_init_creds_opt *krb_options, + time_t *expire_time, + time_t *kdc_time) { krb5_error_code code = 0; krb5_get_creds_opt options; diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index d969e07c616..7a8c7f65ec1 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -260,16 +260,16 @@ krb5_error_code smb_krb5_kinit_password_ccache(krb5_context ctx, time_t *expire_time, time_t *kdc_time); #ifdef SAMBA4_USES_HEIMDAL -krb5_error_code kerberos_kinit_s4u2_cc(krb5_context ctx, - krb5_ccache store_cc, - krb5_principal init_principal, - const char *init_password, - krb5_principal impersonate_principal, - const char *self_service, - const char *target_service, - krb5_get_init_creds_opt *krb_options, - time_t *expire_time, - time_t *kdc_time); +krb5_error_code smb_krb5_kinit_s4u2_ccache(krb5_context ctx, + krb5_ccache store_cc, + krb5_principal init_principal, + const char *init_password, + krb5_principal impersonate_principal, + const char *self_service, + const char *target_service, + krb5_get_init_creds_opt *krb_options, + time_t *expire_time, + time_t *kdc_time); #endif #if defined(HAVE_KRB5_MAKE_PRINCIPAL) diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index 3c25ebf743c..618da626652 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -331,12 +331,16 @@ done: if (password) { if (impersonate_principal) { #ifdef SAMBA4_USES_HEIMDAL - ret = kerberos_kinit_s4u2_cc( - smb_krb5_context->krb5_context, - ccache, princ, password, - impersonate_principal, - self_service, target_service, - krb_options, NULL, &kdc_time); + ret = smb_krb5_kinit_s4u2_ccache(smb_krb5_context->krb5_context, + ccache, + princ, + password, + impersonate_principal, + self_service, + target_service, + krb_options, + NULL, + &kdc_time); #else talloc_free(mem_ctx); (*error_string) = "INTERNAL error: s4u2 ops " -- 2.34.1