From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 31 Jul 2015 15:58:36 +0000 (-0400)
Subject: Don't assert GSS_C_MA_NOT_DFLT_MECH in mechglue
X-Git-Tag: krb5-1.14-alpha1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a34b898b4810e88c9137818b6cd0e762e480196;p=thirdparty%2Fkrb5.git

Don't assert GSS_C_MA_NOT_DFLT_MECH in mechglue

gss_inquire_attrs_for_mech() should not add GSS_C_MA_NOT_DFLT_MECH to
mechs which aren't the default.  The attribute means "MUST NOT be used
as a default mechanism" (RFC 5587) and is intended to be used by the
mechglue.  It does not mean "is not the default mech".

ticket: 8021
---

diff --git a/src/lib/gssapi/mechglue/g_mechattr.c b/src/lib/gssapi/mechglue/g_mechattr.c
index 64bb03bc39..e9299f4737 100644
--- a/src/lib/gssapi/mechglue/g_mechattr.c
+++ b/src/lib/gssapi/mechglue/g_mechattr.c
@@ -183,21 +183,6 @@ gss_inquire_attrs_for_mech(
             return status;
     }
 
-    if (mech_attrs != NULL && mech != gssint_get_mechanism(NULL)) {
-        if (*mech_attrs == GSS_C_NO_OID_SET) {
-            status = generic_gss_create_empty_oid_set(minor, mech_attrs);
-            if (GSS_ERROR(status))
-                return status;
-        }
-
-        status = generic_gss_add_oid_set_member(minor, GSS_C_MA_NOT_DFLT_MECH,
-                                                mech_attrs);
-        if (GSS_ERROR(status)) {
-            gss_release_oid_set(&tmpMinor, mech_attrs);
-            return status;
-        }
-    }
-
     if (known_mech_attrs != NULL && *known_mech_attrs == GSS_C_NO_OID_SET) {
         status = generic_gss_copy_oid_set(minor,
                                           gss_ma_known_attrs,