krb5_wrap: Rename kerberos_kinit_password_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 53660c88536efb96cf6453ef48ca28fda16f4974..b19c26c4d86a4f3a1619fd36b5c183ca1aa19682 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -1825,13 +1825,14 @@ done:
        return code;
 }
 
-krb5_error_code kerberos_kinit_password_cc(krb5_context ctx, krb5_ccache cc,
-                                          krb5_principal principal,
-                                          const char *password,
-                                          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_password_ccache(krb5_context ctx,
+                                              krb5_ccache cc,
+                                              krb5_principal principal,
+                                              const char *password,
+                                              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;
@@ -2186,7 +2187,7 @@ krb5_error_code kerberos_kinit_s4u2_cc(krb5_context ctx,
                if (code != 0) {
                        ip = NULL;
                }
-               DEBUG(1, ("kerberos_kinit_password_cc: "
+               DEBUG(1, ("smb_krb5_kinit_password_cache: "
                          "KDC returned self principal[%s] while impersonating [%s]\n",
                          sp?sp:"<no memory>",
                          ip?ip:"<no memory>"));
@@ -2216,7 +2217,7 @@ krb5_error_code kerberos_kinit_s4u2_cc(krb5_context ctx,
                if (code != 0) {
                        ep = NULL;
                }
-               DEBUG(1, ("kerberos_kinit_password_cc: "
+               DEBUG(1, ("smb_krb5_kinit_password_cache: "
                          "KDC returned wrong principal[%s] we expected [%s]\n",
                          sp?sp:"<no memory>",
                          ep?ep:"<no memory>"));

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index a6be348acda16617dc8e949ada3332dc74eede4c..d969e07c616f4a02eacec98c8b95df5b9405c838 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -251,14 +251,14 @@ krb5_error_code smb_krb5_kinit_keyblock_ccache(krb5_context ctx,
                                               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,
-                                          const char *password,
-                                          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_password_ccache(krb5_context ctx,
+                                              krb5_ccache cc,
+                                              krb5_principal principal,
+                                              const char *password,
+                                              const char *target_service,
+                                              krb5_get_init_creds_opt *krb_options,
+                                              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,

diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 4bbb2c7afa8d48fce1a9b73c6c9c876113358fcd..3c25ebf743c1681b71f4e8c4f311395680edc8ed 100644 (file)
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -344,11 +344,14 @@ done:
                                return EINVAL;
 #endif
                        } else {
-                               ret = kerberos_kinit_password_cc(
-                                               smb_krb5_context->krb5_context,
-                                               ccache, princ, password,
-                                               target_service,
-                                               krb_options, NULL, &kdc_time);
+                               ret = smb_krb5_kinit_password_ccache(smb_krb5_context->krb5_context,
+                                                                    ccache,
+                                                                    princ,
+                                                                    password,
+                                                                    target_service,
+                                                                    krb_options,
+                                                                    NULL,
+                                                                    &kdc_time);
                        }
                } else if (impersonate_principal) {
                        talloc_free(mem_ctx);