diff --git a/kdc/altsecid_gss_preauth_authorizer.c b/kdc/altsecid_gss_preauth_authorizer.c index 559c53f18..d48ea584b 100644 --- a/kdc/altsecid_gss_preauth_authorizer.c +++ b/kdc/altsecid_gss_preauth_authorizer.c @@ -523,8 +523,6 @@ altsecid_gss_preauth_authorizer_get_instance(const char *libname) return krb5_get_instance(libname); if (strcmp(libname, "kdc") == 0) return kdc_get_instance(libname); - if (strcmp(libname, "gssapi") == 0) - return gss_get_instance(libname); return 0; } diff --git a/kdc/kdc-plugin.c b/kdc/kdc-plugin.c index dce661d48..74ee13272 100644 --- a/kdc/kdc-plugin.c +++ b/kdc/kdc-plugin.c @@ -302,8 +302,6 @@ kdc_get_instance(const char *libname) return hdb_get_instance(libname); else if (strcmp(libname, "krb5") == 0) return krb5_get_instance(libname); - else if (strcmp(libname, "gssapi") == 0) - return gss_get_instance(libname); return 0; } diff --git a/kdc/negotiate_token_validator.c b/kdc/negotiate_token_validator.c index ad5db1e3c..20250c6dc 100644 --- a/kdc/negotiate_token_validator.c +++ b/kdc/negotiate_token_validator.c @@ -304,8 +304,6 @@ negotiate_get_instance(const char *libname) { if (strcmp(libname, "krb5") == 0) return krb5_get_instance(libname); - else if (strcmp(libname, "gssapi") == 0) - return gss_get_instance(libname); return 0; } diff --git a/lib/gssapi/gssapi/gssapi.h b/lib/gssapi/gssapi/gssapi.h index 671da64cd..726543f5a 100644 --- a/lib/gssapi/gssapi/gssapi.h +++ b/lib/gssapi/gssapi/gssapi.h @@ -1253,9 +1253,6 @@ GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_destroy_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle); -GSSAPI_LIB_FUNCTION uintptr_t GSSAPI_CALLCONV -gss_get_instance(const char *libname); - /* * S4UProxy and S4USelf extensions. */ diff --git a/lib/gssapi/libgssapi-exports.def b/lib/gssapi/libgssapi-exports.def index f12dea10e..6077c8e26 100644 --- a/lib/gssapi/libgssapi-exports.def +++ b/lib/gssapi/libgssapi-exports.def @@ -42,7 +42,6 @@ EXPORTS gss_export_name gss_export_name_composite gss_export_sec_context - gss_get_instance gss_get_mic gss_get_neg_mechs gss_get_name_attribute diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c index b5befeed7..372e72dd5 100644 --- a/lib/gssapi/mech/gss_mech_switch.c +++ b/lib/gssapi/mech/gss_mech_switch.c @@ -583,16 +583,3 @@ gss_oid_to_name(gss_const_OID oid) return NULL; } - -GSSAPI_LIB_FUNCTION uintptr_t GSSAPI_CALLCONV -gss_get_instance(const char *libname) -{ - static const char *instance = "libgssapi"; - - if (strcmp(libname, "gssapi") == 0) - return (uintptr_t)instance; - else if (strcmp(libname, "krb5") == 0) - return krb5_get_instance(libname); - - return 0; -} diff --git a/lib/gssapi/version-script.map b/lib/gssapi/version-script.map index 66e1b8dd7..7f482b536 100644 --- a/lib/gssapi/version-script.map +++ b/lib/gssapi/version-script.map @@ -45,7 +45,6 @@ HEIMDAL_GSS_2.0 { gss_export_name; gss_export_name_composite; gss_export_sec_context; - gss_get_instance; gss_get_mic; gss_get_neg_mechs; gss_get_name_attribute;