summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-02-27 17:29:16 -0500
committerGreg Hudson <ghudson@mit.edu>2013-02-27 17:29:16 -0500
commit8df7b929c3ee272e8255d57720c3e299ebccd198 (patch)
treea20e87efe492ed60b0d25838ff825deb3820f2d3 /src/lib
parentf09c97320e683a2ad0e42df63aeedd16b78c9ad2 (diff)
downloadkrb5-8df7b929c3ee272e8255d57720c3e299ebccd198.tar.gz
krb5-8df7b929c3ee272e8255d57720c3e299ebccd198.tar.xz
krb5-8df7b929c3ee272e8255d57720c3e299ebccd198.zip
Add krb5_free_enctypes API
Rename krb5_free_ktypes to krb5_free_enctypes and add it to the public API. ticket: 7584
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb5/ccache/cc_mslsa.c4
-rw-r--r--src/lib/krb5/krb/init_ctx.c4
-rw-r--r--src/lib/krb5/libkrb5.exports2
-rw-r--r--src/lib/krb5_32.def4
4 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index d692b4270..bfaae650b 100644
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -1207,7 +1207,7 @@ krb5_is_permitted_tgs_enctype(krb5_context context, krb5_const_principal princ,
if (*ptr == etype)
ret = 1;
- krb5_free_ktypes (context, list);
+ krb5_free_enctypes(context, list);
return(ret);
}
@@ -1502,7 +1502,7 @@ GetMSTGT(krb5_context context, HANDLE LogonHandle, ULONG PackageId, KERB_EXTERNA
cleanup:
if ( etype_list )
- krb5_free_ktypes(context, etype_list);
+ krb5_free_enctypes(context, etype_list);
if ( pTicketRequest )
LocalFree(pTicketRequest);
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 6054b2056..33330e7b6 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -543,7 +543,7 @@ krb5_get_default_in_tkt_ktypes(krb5_context context, krb5_enctype **ktypes)
void
KRB5_CALLCONV
-krb5_free_ktypes (krb5_context context, krb5_enctype *val)
+krb5_free_enctypes(krb5_context context, krb5_enctype *val)
{
free (val);
}
@@ -582,6 +582,6 @@ krb5_is_permitted_enctype(krb5_context context, krb5_enctype etype)
if (krb5_get_permitted_enctypes(context, &list))
return FALSE;
ret = k5_etypes_contains(list, etype);
- krb5_free_ktypes(context, list);
+ krb5_free_enctypes(context, list);
return ret;
}
diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index eb3eb79c8..8d19f1493 100644
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -291,6 +291,7 @@ krb5_free_enc_kdc_rep_part
krb5_free_enc_sam_response_enc_2
krb5_free_enc_sam_response_enc_2_contents
krb5_free_enc_tkt_part
+krb5_free_enctypes
krb5_free_error
krb5_free_error_message
krb5_free_etype_info
@@ -306,7 +307,6 @@ krb5_free_keyblock
krb5_free_keyblock_contents
krb5_free_keytab_entry_contents
krb5_free_krbhst
-krb5_free_ktypes
krb5_free_last_req
krb5_free_octet_data
krb5_free_pa_data
diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index 0d066cbf1..d093d1f7b 100644
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -274,7 +274,6 @@ EXPORTS
krb5int_cc_default @268 ; PRIVATE GSSAPI k5-int.h
krb5_free_ap_req @119 ; PRIVATE GSSAPI krb5.hin
- krb5_free_ktypes @139 ; PRIVATE GSSAPI krb5.hin
krb5_get_tgs_ktypes @177 ; PRIVATE GSSAPI krb5.hin
krb5_auth_con_set_req_cksumtype @36 ; PRIVATE GSSAPI krb5.hin
krb5_kt_free_entry @192 ; PRIVATE GSSAPI krb5.hin
@@ -445,3 +444,6 @@ EXPORTS
krb5_cc_move @416
krb5_get_init_creds_opt_set_in_ccache @417
krb5int_build_conf_principals @418 ; PRIVATE
+
+; new in 1.12
+ krb5_free_enctypes @419