summaryrefslogtreecommitdiff
path: root/lib/krb5_wrap
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2016-08-29 11:47:11 +0200
committerAndrew Bartlett <abartlet@samba.org>2016-08-31 20:59:16 +0200
commit696cfcb3c0e4c44ab894b78d3337fe5d28e254bd (patch)
tree580348af8c5237e80d87c25ba4ec8d39ebc0f909 /lib/krb5_wrap
parent294df2e52c37ae4be1f8995db90d930f29a4713c (diff)
downloadsamba-696cfcb3c0e4c44ab894b78d3337fe5d28e254bd.tar.gz
krb5_wrap: Rename kerberos_kinit_password_cc()
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/krb5_wrap')
-rw-r--r--lib/krb5_wrap/krb5_samba.c19
-rw-r--r--lib/krb5_wrap/krb5_samba.h16
2 files changed, 18 insertions, 17 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 53660c88536..b19c26c4d86 100644
--- 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 a6be348acda..d969e07c616 100644
--- 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,