[29015] in CVS-changelog-for-Kerberos-V5
krb5 commit: Don't assert GSS_C_MA_NOT_DFLT_MECH in mechglue
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Aug 10 13:38:08 2015
Date: Mon, 10 Aug 2015 13:38:00 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201508101738.t7AHc0LJ029846@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/2a34b898b4810e88c9137818b6cd0e762e480196
commit 2a34b898b4810e88c9137818b6cd0e762e480196
Author: Greg Hudson <ghudson@mit.edu>
Date: Fri Jul 31 11:58:36 2015 -0400
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
src/lib/gssapi/mechglue/g_mechattr.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/src/lib/gssapi/mechglue/g_mechattr.c b/src/lib/gssapi/mechglue/g_mechattr.c
index 64bb03b..e9299f4 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,
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5