From d116a78297a06fb865ae95d5496ae2c4de60f971 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Mon, 21 Mar 2011 23:53:17 +1100
Subject: [PATCH] add missing exports

---
 lib/gssapi/mech/gss_mech_switch.c | 8 +++++---
 lib/gssapi/version-script.map     | 8 +++++---
 lib/krb5/libkrb5-exports.def.in   | 2 ++
 lib/krb5/version-script.map       | 2 ++
 4 files changed, 14 insertions(+), 6 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;
 	}
diff --git a/lib/gssapi/version-script.map b/lib/gssapi/version-script.map
index 3de097f0c..9570559d1 100644
--- a/lib/gssapi/version-script.map
+++ b/lib/gssapi/version-script.map
@@ -2,7 +2,8 @@
 
 HEIMDAL_GSS_2.0 {
 	global:
-		__gss_c_nt_anonymous;
+#		__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;
@@ -60,13 +61,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;
@@ -79,10 +79,12 @@ 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;
 		gss_unwrap_iov;
+		gss_userok;
 		gss_verify;
 		gss_verify_mic;
 		gss_wrap;
diff --git a/lib/krb5/libkrb5-exports.def.in b/lib/krb5/libkrb5-exports.def.in
index a61300f70..22c16dfed 100644
--- a/lib/krb5/libkrb5-exports.def.in
+++ b/lib/krb5/libkrb5-exports.def.in
@@ -396,6 +396,8 @@ EXPORTS
 	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
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;