sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-09 01:44:21 +03:00
Code Activity

auth/credentials-krb5: use get_kerberos_allowed_etypes().

Browse Source 
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Günther Deschner
2014-04-29 18:22:55 +02:00
committed by Andrew Bartlett
parent 3d56bcc1de
commit fb2a8b34c1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
auth/credentials/credentials_krb5.c
View File

@@ -595,7 +595,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
return ret; return ret;
} }
#ifdef SAMBA4_USES_HEIMDAL /* MIT lacks krb5_get_default_in_tkt_etypes */
/* /*
* transfer the enctypes from the smb_krb5_context to the gssapi layer * transfer the enctypes from the smb_krb5_context to the gssapi layer
* *
@@ -607,9 +607,8 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
* and used for the AS-REQ, so it wasn't possible to disable the usage * and used for the AS-REQ, so it wasn't possible to disable the usage
* of AES keys. * of AES keys.
*/ */
min_stat = krb5_get_default_in_tkt_etypes(ccache->smb_krb5_context->krb5_context, min_stat = get_kerberos_allowed_etypes(ccache->smb_krb5_context->krb5_context,
KRB5_PDU_NONE, &etypes);
&etypes);
if (min_stat == 0) { if (min_stat == 0) {
OM_uint32 num_ktypes; OM_uint32 num_ktypes;
@@ -618,7 +617,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gcc->creds, maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gcc->creds,
num_ktypes, num_ktypes,
(int32_t *) etypes); (int32_t *) etypes);
krb5_xfree (etypes); SAFE_FREE(etypes);
if (maj_stat) { if (maj_stat) {
talloc_free(gcc); talloc_free(gcc);
if (min_stat) { if (min_stat) {
@@ -630,7 +629,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
return ret; return ret;
} }
} }
#endif
#ifdef SAMBA4_USES_HEIMDAL /* MIT lacks GSS_KRB5_CRED_NO_CI_FLAGS_X */ #ifdef SAMBA4_USES_HEIMDAL /* MIT lacks GSS_KRB5_CRED_NO_CI_FLAGS_X */
/* don't force GSS_C_CONF_FLAG and GSS_C_INTEG_FLAG */ /* don't force GSS_C_CONF_FLAG and GSS_C_INTEG_FLAG */