From 0a9178e6107d848ab9c1356ea96fa1f3e91a172c Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 21 Mar 2011 16:39:35 +1100 Subject: [PATCH 1/6] remove deprecated naming extension APIs, add pname/userok --- lib/gssapi/version-script.map | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gssapi/version-script.map b/lib/gssapi/version-script.map index 3de097f0c..10d2fa0b0 100644 --- a/lib/gssapi/version-script.map +++ b/lib/gssapi/version-script.map @@ -60,13 +60,12 @@ HEIMDAL_GSS_2.0 { gss_krb5_get_tkt_flags; gss_krb5_import_cred; gss_krb5_set_allowable_enctypes; - gss_map_name_to_any; gss_mg_collect_error; gss_oid_equal; gss_oid_to_str; + gss_pname_to_uid; gss_process_context_token; gss_pseudo_random; - gss_release_any_name_mapping; gss_release_buffer; gss_release_buffer_set; gss_release_cred; @@ -83,6 +82,7 @@ HEIMDAL_GSS_2.0 { gss_unseal; gss_unwrap; gss_unwrap_iov; + gss_userok; gss_verify; gss_verify_mic; gss_wrap; From e8dc503c5d3ded56d2a17a8528fc20e6c67b171b Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 21 Mar 2011 16:42:49 +1100 Subject: [PATCH 2/6] export krb5_kcm_call/krb5_kcm_storage_request --- lib/krb5/version-script.map | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/krb5/version-script.map b/lib/krb5/version-script.map index c32a094f6..de95c020d 100644 --- a/lib/krb5/version-script.map +++ b/lib/krb5/version-script.map @@ -387,6 +387,8 @@ HEIMDAL_KRB5_2.0 { krb5_initlog; krb5_is_config_principal; krb5_is_thread_safe; + krb5_kcm_call; + krb5_kcm_storage_request; krb5_kerberos_enctypes; krb5_keyblock_get_enctype; krb5_keyblock_init; From 8a88550546832ee8b5d93e0f6a92270a47e46eef Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 21 Mar 2011 16:54:27 +1100 Subject: [PATCH 3/6] export gss_store_cred --- lib/gssapi/libgssapi-exports.def | 1 + lib/gssapi/version-script.map | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/gssapi/libgssapi-exports.def b/lib/gssapi/libgssapi-exports.def index ed31953a6..21989e6db 100644 --- a/lib/gssapi/libgssapi-exports.def +++ b/lib/gssapi/libgssapi-exports.def @@ -86,6 +86,7 @@ EXPORTS gss_set_name_attribute gss_set_sec_context_option gss_sign + gss_store_cred gss_test_oid_set_member gss_unseal gss_unwrap diff --git a/lib/gssapi/version-script.map b/lib/gssapi/version-script.map index 10d2fa0b0..d1df0934c 100644 --- a/lib/gssapi/version-script.map +++ b/lib/gssapi/version-script.map @@ -78,6 +78,7 @@ HEIMDAL_GSS_2.0 { gss_set_name_attribute; gss_set_sec_context_option; gss_sign; + gss_store_cred; gss_test_oid_set_member; gss_unseal; gss_unwrap; From 841a5ed3ba64cc43b76edb164ff5d4b548c3d069 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 21 Mar 2011 16:42:49 +1100 Subject: [PATCH 4/6] export krb5_kcm_call/krb5_kcm_storage_request Signed-off-by: Love Hornquist Astrand --- lib/krb5/version-script.map | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/krb5/version-script.map b/lib/krb5/version-script.map index c32a094f6..de95c020d 100644 --- a/lib/krb5/version-script.map +++ b/lib/krb5/version-script.map @@ -387,6 +387,8 @@ HEIMDAL_KRB5_2.0 { krb5_initlog; krb5_is_config_principal; krb5_is_thread_safe; + krb5_kcm_call; + krb5_kcm_storage_request; krb5_kerberos_enctypes; krb5_keyblock_get_enctype; krb5_keyblock_init; From ff3ec1ee9178bd7c6dde61c7211257267169d500 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 21 Mar 2011 17:46:07 +1100 Subject: [PATCH 5/6] fix error case crasher --- lib/gssapi/mech/gss_mech_switch.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c index 14ff5b4f2..d272958c3 100644 --- a/lib/gssapi/mech/gss_mech_switch.c +++ b/lib/gssapi/mech/gss_mech_switch.c @@ -388,9 +388,11 @@ _gss_load_mech(void) continue; bad: - free(m->gm_mech.gm_compat); - free(m->gm_mech.gm_mech_oid.elements); - free(m); + if (m != NULL) { + free(m->gm_mech.gm_compat); + free(m->gm_mech.gm_mech_oid.elements); + free(m); + } dlclose(so); continue; } From 6b9ec3e0479cdcb34f617c71cd5b1ecb2a434f8c Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 21 Mar 2011 17:59:42 +1100 Subject: [PATCH 6/6] add __gss_c_nt_anonymous_oid_desc to version script --- lib/gssapi/version-script.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gssapi/version-script.map b/lib/gssapi/version-script.map index d1df0934c..51b776cf5 100644 --- a/lib/gssapi/version-script.map +++ b/lib/gssapi/version-script.map @@ -2,7 +2,7 @@ HEIMDAL_GSS_2.0 { global: - __gss_c_nt_anonymous; + __gss_c_nt_anonymous_oid_desc; __gss_c_nt_export_name_oid_desc; __gss_c_nt_hostbased_service_oid_desc; __gss_c_nt_hostbased_service_x_oid_desc;