krb5_wrap: Rename kerberos_kinit_s4u2_cc()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 130a11be273bc0cf0a9313063b4b36828fa46bbe..e21a79f4f4c286461f3238fba20b53572645e427 100644 (file)
--- 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 d969e07c616f4a02eacec98c8b95df5b9405c838..7a8c7f65ec14dde54d5c71b2bf479dc3aa2fbace 100644 (file)
--- 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 3c25ebf743c1681b71f4e8c4f311395680edc8ed..618da62665204c7e46cc86b8e73b9b77eef49b93 100644 (file)
--- 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 "