krb5_wrap: Rename get_kerberos_allowed_etypes()

Use consistent naming.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index 82b6de963f73e179b87d93266a3feca989c9250d..36c8a32d28b1cfaac127fbf1767912a4b30019d7 100644 (file)
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -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;

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 7997fe5f7436107114b89002051be79e752cee2d..3cdaaa1fb41d58d5b2148eea27f6b7181a5a7f7e 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -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

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index db70bb8cd6db44b04717eca3c7261fbeffb9de80..4841d69cbb49d0140da19463fca2da098f349b92 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -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,

diff --git a/source3/librpc/crypto/gse_krb5.c b/source3/librpc/crypto/gse_krb5.c
index e0021d08b56048d1a9830b2e250fb1bb13c4629d..85652b77d76449d80652d22cbafe0980334119b3 100644 (file)
--- a/source3/librpc/crypto/gse_krb5.c
+++ b/source3/librpc/crypto/gse_krb5.c
@@ -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"));