sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

krb5_wrap: Rename kerberos_kinit_s4u2_cc()

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2016-08-29 11:59:18 +02:00 committed by Andrew Bartlett
parent 13da688047
commit 2ac297562f
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5_wrap/krb5_samba.c
View File

@ -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;

20
lib/krb5_wrap/krb5_samba.h
View File

@ -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)

16
source4/auth/kerberos/kerberos_util.c
View File

@ -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 "