From: Luke Howard <lukeh@padl.com>
Date: Wed, 26 Aug 2009 17:36:27 +0000 (+0000)
Subject: comment out composite name hack for now
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff515371b2da4c59dc4c116295ea8abcd075da8;p=thirdparty%2Fkrb5.git

comment out composite name hack for now

git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/authdata@22629 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c
index 2f32e555e2..aafc20e06e 100644
--- a/src/lib/gssapi/mechglue/g_glue.c
+++ b/src/lib/gssapi/mechglue/g_glue.c
@@ -288,6 +288,7 @@ OM_uint32 gssint_get_mech_type(OID, token)
  *  Internal routines to get and release an internal mechanism name
  */
 
+#if 0
 static OM_uint32
 import_internal_name_composite(OM_uint32 *minor_status,
 			       gss_mechanism mech,
@@ -326,6 +327,7 @@ import_internal_name_composite(OM_uint32 *minor_status,
 
     return (status);
 }
+#endif
 
 OM_uint32 gssint_import_internal_name (minor_status, mech_type, union_name, 
 				internal_name)
@@ -341,6 +343,7 @@ gss_name_t	*internal_name;
     if (mech == NULL)
 	return (GSS_S_BAD_MECH);
 
+#if 0
     /* Try composite name, it will preserve any extended attributes */
     if (union_name->mech_type && union_name->mech_name) {
 	status = import_internal_name_composite(minor_status,
@@ -350,6 +353,7 @@ gss_name_t	*internal_name;
 	if (status == GSS_S_COMPLETE)
 	    return (GSS_S_COMPLETE);
     }
+#endif
 
     if (mech->gss_import_name == NULL)
 	return (GSS_S_UNAVAILABLE);