cleanup, notes on composite names

diff --git a/mech_eap/export_name_composite.c b/mech_eap/export_name_composite.c
index 97e6dd5..2b80dba 100644 (file)
--- a/mech_eap/export_name_composite.c
+++ b/mech_eap/export_name_composite.c
@@ -32,6 +32,11 @@
 
 #include "gssapiP_eap.h"
 
+/*
+ * Not sure about this. If we have a generalised representation of composite
+ * names, it should be (a) defined in the naming extensions specification
+ * and (b) implemented by the mechanism glue.
+ */
 OM_uint32
 gss_export_name_composite(OM_uint32 *minor,
                           gss_name_t input_name,

diff --git a/mech_eap/util_name.c b/mech_eap/util_name.c
index 58919e1..be7f4cb 100644 (file)
--- a/mech_eap/util_name.c
+++ b/mech_eap/util_name.c
@@ -384,12 +384,6 @@ gssEapExportName(OM_uint32 *minor,
     GSSEAP_KRB_INIT(&krbContext);
     GSSEAP_MUTEX_LOCK(&name->mutex);
 
-    /*
-     * Don't export a composite name if we don't have any attributes.
-     */
-    if (composite && !NAME_HAS_ATTRIBUTES(name))
-        composite = 0;
-
     *minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
     if (*minor != 0) {
         major = GSS_S_FAILURE;