From: Luke Howard <lukeh@padl.com>
Date: Wed, 8 Sep 2010 16:15:00 +0000 (+0200)
Subject: Implement gss_indicate_mechs/gss_inquire_mechs_for_name
X-Git-Tag: vm/20110310~381
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=93054b5558ab487334f1ea0fb127ac42f4188913

Implement gss_indicate_mechs/gss_inquire_mechs_for_name
---

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index 9bafde4..92cadac 100644
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -60,6 +60,9 @@
 #define NAME_FLAG_SAML                      0x00000010
 #define NAME_FLAG_RADIUS                    0x00000020
 
+#define NAME_HAS_ATTRIBUTES(name)           ((name)->flags & \
+                                             (NAME_FLAG_SAML | NAME_FLAG_RADIUS))
+
 struct eap_gss_saml_assertion;
 struct eap_gss_avp_list;
 
diff --git a/indicate_mechs.c b/indicate_mechs.c
index 373e481..7f98a80 100644
--- a/indicate_mechs.c
+++ b/indicate_mechs.c
@@ -36,5 +36,5 @@ OM_uint32
 gss_indicate_mechs(OM_uint32 *minor,
                    gss_OID_set *mech_set)
 {
-    GSSEAP_NOT_IMPLEMENTED;
+    return gssEapIndicateMechs(minor, mech_set);
 }
diff --git a/inquire_mechs_for_name.c b/inquire_mechs_for_name.c
index 2624dac..045d0d8 100644
--- a/inquire_mechs_for_name.c
+++ b/inquire_mechs_for_name.c
@@ -37,5 +37,5 @@ gss_inquire_mechs_for_name(OM_uint32 *minor,
                            const gss_name_t input_name,
                            gss_OID_set *mech_types)
 {
-    GSSEAP_NOT_IMPLEMENTED;
+    return gssEapIndicateMechs(minor, mech_types);
 }
diff --git a/util_name.c b/util_name.c
index a36c0d9..4c6c324 100644
--- a/util_name.c
+++ b/util_name.c
@@ -325,10 +325,8 @@ OM_uint32 gssEapExportName(OM_uint32 *minor,
     /*
      * Don't export a composite name if we don't have any attributes.
      */
-    if (composite &&
-        (name->flags & (NAME_FLAG_SAML | NAME_FLAG_RADIUS)) == 0) {
+    if (composite && !NAME_HAS_ATTRIBUTES(name))
         composite = 0;
-    }
 
     *minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
     if (*minor != 0)