diff --git a/lib/gssapi/spnego/context_stubs.c b/lib/gssapi/spnego/context_stubs.c
index 1faf26799..b8c64bbf7 100644
--- a/lib/gssapi/spnego/context_stubs.c
+++ b/lib/gssapi/spnego/context_stubs.c
@@ -459,15 +459,6 @@ OM_uint32 gss_spnego_import_sec_context (
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gss_spnego_inquire_names_for_mech (
-            OM_uint32 * minor_status,
-            const gss_OID mechanism,
-            gss_OID_set * name_types
-           )
-{
-    return gss_create_empty_oid_set(minor_status, name_types);
-}
-
 OM_uint32 gss_spnego_inquire_mechs_for_name (
             OM_uint32 * minor_status,
             const gss_name_t input_name,
@@ -496,10 +487,7 @@ OM_uint32 gss_spnego_canonicalize_name (
             gss_name_t * output_name
            )
 {
-    return gss_canonicalize_name(minor_status,
-				 input_name,
-				 mech_type,
-				 output_name);
+    return gss_duplicate_name(minor_status, input_name, output_name);
 }
 
 OM_uint32 gss_spnego_duplicate_name (
diff --git a/lib/gssapi/spnego/external.c b/lib/gssapi/spnego/external.c
index 558ef3ac5..710d93ccd 100644
--- a/lib/gssapi/spnego/external.c
+++ b/lib/gssapi/spnego/external.c
@@ -71,7 +71,7 @@ static gssapi_mech_interface_desc spnego_mech = {
     gss_spnego_inquire_cred_by_mech,
     gss_spnego_export_sec_context,
     gss_spnego_import_sec_context,
-    gss_spnego_inquire_names_for_mech,
+    NULL,
     gss_spnego_inquire_mechs_for_name,
     gss_spnego_canonicalize_name,
     gss_spnego_duplicate_name
diff --git a/lib/gssapi/spnego/spnego_locl.h b/lib/gssapi/spnego/spnego_locl.h
index 96ca24056..1e8071197 100644
--- a/lib/gssapi/spnego/spnego_locl.h
+++ b/lib/gssapi/spnego/spnego_locl.h
@@ -345,12 +345,6 @@ OM_uint32 gss_spnego_test_oid_set_member (
             int * /*present*/
            );
 
-OM_uint32 gss_spnego_inquire_names_for_mech (
-            OM_uint32 * /*minor_status*/,
-            const gss_OID /*mechanism*/,
-            gss_OID_set * /*name_types*/
-           );
-
 OM_uint32 gss_spnego_inquire_mechs_for_name (
             OM_uint32 * /*minor_status*/,
             const gss_name_t /*input_name*/,