diff options
author | Simo Sorce <idra@samba.org> | 2012-04-21 16:35:48 -0400 |
---|---|---|
committer | Simo Sorce <idra@samba.org> | 2012-04-23 16:40:49 -0400 |
commit | f7070c90b94954835478a09e89a85c03f0f85500 (patch) | |
tree | 855be9bce58a0d27c6a771833a308a73d69fa322 /source4/auth/kerberos/kerberos_util.c | |
parent | 110dad8c9eb95e6729e589b52ef204d369803bdb (diff) | |
download | samba-f7070c90b94954835478a09e89a85c03f0f85500.tar.gz samba-f7070c90b94954835478a09e89a85c03f0f85500.tar.xz samba-f7070c90b94954835478a09e89a85c03f0f85500.zip |
For now just disable this Heindal specific stuff in the MIT build
Diffstat (limited to 'source4/auth/kerberos/kerberos_util.c')
-rw-r--r-- | source4/auth/kerberos/kerberos_util.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index d30ac24c34..9933ca84c7 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -224,11 +224,13 @@ static krb5_error_code impersonate_principal_from_credentials( while (tries--) { struct tevent_context *previous_ev; /* Do this every time, in case we have weird recursive issues here */ +#ifdef SAMBA4_USES_HEIMDAL ret = smb_krb5_context_set_event_ctx(smb_krb5_context, event_ctx, &previous_ev); if (ret) { talloc_free(mem_ctx); return ret; } +#endif if (password) { ret = kerberos_kinit_password_cc(smb_krb5_context->krb5_context, ccache, princ, password, @@ -251,7 +253,9 @@ static krb5_error_code impersonate_principal_from_credentials( talloc_free(mem_ctx); (*error_string) = "kinit_to_ccache: No password available for kinit\n"; krb5_get_init_creds_opt_free(smb_krb5_context->krb5_context, krb_options); +#ifdef SAMBA4_USES_HEIMDAL smb_krb5_context_remove_event_ctx(smb_krb5_context, previous_ev, event_ctx); +#endif return EINVAL; } ret = krb5_keyblock_init(smb_krb5_context->krb5_context, @@ -268,7 +272,9 @@ static krb5_error_code impersonate_principal_from_credentials( } } +#ifdef SAMBA4_USES_HEIMDAL smb_krb5_context_remove_event_ctx(smb_krb5_context, previous_ev, event_ctx); +#endif if (ret == KRB5KRB_AP_ERR_SKEW || ret == KRB5_KDCREP_SKEW) { /* Perhaps we have been given an invalid skew, so try again without it */ |