sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

krb5_wrap: Rename get_kerberos_allowed_etypes()

Browse Source 
Use consistent naming.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2016-08-25 17:02:59 +02:00 committed by Andrew Bartlett
parent 81917a1162
commit 2622e16d76
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/credentials/credentials_krb5.c
View File

@ -611,7 +611,7 @@ _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
* of AES keys.
*/
min_stat = get_kerberos_allowed_etypes(ccache->smb_krb5_context->krb5_context,
min_stat = smb_krb5_get_allowed_etypes(ccache->smb_krb5_context->krb5_context,
&etypes);
if (min_stat == 0) {
OM_uint32 num_ktypes;

18
lib/krb5_wrap/krb5_samba.c
View File

@ -312,13 +312,27 @@ int smb_krb5_get_pw_salt(krb5_context context,
#endif
#if defined(HAVE_KRB5_GET_PERMITTED_ENCTYPES)
krb5_error_code get_kerberos_allowed_etypes(krb5_context context,
/**
* @brief Get a list of encryption types allowed for session keys
*
* @param[in] context The library context
*
* @param[in] enctypes An allocated, zero-terminated list of encryption types
*
* This function returns an allocated list of encryption types allowed for
* session keys.
*
* Use free() to free the enctypes when it is no longer needed.
*
* @retval 0 Success; otherwise - Kerberos error codes
*/
krb5_error_code smb_krb5_get_allowed_etypes(krb5_context context,
krb5_enctype **enctypes)
{
return krb5_get_permitted_enctypes(context, enctypes);
}
#elif defined(HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES)
krb5_error_code get_kerberos_allowed_etypes(krb5_context context,
krb5_error_code smb_krb5_get_allowed_etypes(krb5_context context,
krb5_enctype **enctypes)
{
#ifdef HAVE_KRB5_PDU_NONE_DECL

4
lib/krb5_wrap/krb5_samba.h
View File

@ -171,7 +171,9 @@ krb5_error_code smb_krb5_mk_error(krb5_context context,
krb5_data *e_data,
krb5_data *enc_err);
krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
krb5_error_code smb_krb5_get_allowed_etypes(krb5_context context,
krb5_enctype **enctypes);
bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,
krb5_context context,
krb5_auth_context auth_context,

2
source3/librpc/crypto/gse_krb5.c
View File

@ -123,7 +123,7 @@ static krb5_error_code fill_keytab_from_password(krb5_context krbctx,
krb5_keytab_entry kt_entry;
unsigned int i;
ret = get_kerberos_allowed_etypes(krbctx, &enctypes);
ret = smb_krb5_get_allowed_etypes(krbctx, &enctypes);
if (ret) {
DEBUG(1, (__location__
": Can't determine permitted enctypes!\n"));