From 15c5dd700cba24b97ab8ab96710c068335e1edb1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 29 Aug 2016 11:33:24 +0200 Subject: [PATCH] krb5_wrap: Rename kerberos_kinit_keyblock_cc() Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- lib/krb5_wrap/krb5_samba.c | 15 ++++++++------- lib/krb5_wrap/krb5_samba.h | 15 ++++++++------- source4/auth/kerberos/kerberos_util.c | 12 ++++++++---- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 06f144971f9..656fd7791ce 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1723,13 +1723,14 @@ krb5_error_code smb_krb5_keyblock_init_contents(krb5_context context, The target_service defaults to the krbtgt if NULL, but could be kpasswd/realm or the local service (if we are doing s4u2self) */ -krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc, - krb5_principal principal, - krb5_keyblock *keyblock, - 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_keyblock_ccache(krb5_context ctx, + krb5_ccache cc, + krb5_principal principal, + krb5_keyblock *keyblock, + 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_creds my_creds; diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index e10155d088a..a6be348acda 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -243,13 +243,14 @@ krb5_error_code smb_krb5_keyblock_init_contents(krb5_context context, const void *data, size_t length, krb5_keyblock *key); -krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc, - krb5_principal principal, - krb5_keyblock *keyblock, - 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_keyblock_ccache(krb5_context ctx, + krb5_ccache cc, + krb5_principal principal, + krb5_keyblock *keyblock, + const char *target_service, + krb5_get_init_creds_opt *krb_options, + time_t *expire_time, + time_t *kdc_time); krb5_error_code kerberos_kinit_password_cc(krb5_context ctx, krb5_ccache cc, krb5_principal principal, diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index 653e3d2b6fd..4bbb2c7afa8 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -375,10 +375,14 @@ done: &keyblock); if (ret == 0) { - ret = kerberos_kinit_keyblock_cc(smb_krb5_context->krb5_context, ccache, - princ, &keyblock, - target_service, krb_options, - NULL, &kdc_time); + ret = smb_krb5_kinit_keyblock_ccache(smb_krb5_context->krb5_context, + ccache, + princ, + &keyblock, + target_service, + krb_options, + NULL, + &kdc_time); krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &keyblock); } } -- 2.34.1