initial libradsec port

[mech_eap.orig] / export_name_composite.c

diff --git a/export_name_composite.c b/export_name_composite.c
index 859baaa..dffff14 100644 (file)
--- a/export_name_composite.c
+++ b/export_name_composite.c
@@ -32,21 +32,27 @@
 
 #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,
                           gss_buffer_t exported_name)
 {
+    OM_uint32 major;
+
+    *minor = 0;
+
     if (input_name == GSS_C_NO_NAME) {
         *minor = EINVAL;
         return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_BAD_NAME;
     }
 
-    return gssEapExportNameInternal(minor, input_name, exported_name,
-                                    EXPORT_NAME_FLAG_OID | EXPORT_NAME_FLAG_ATTRS);
+    GSSEAP_MUTEX_LOCK(&input_name->mutex);
+
+    major = gssEapExportNameInternal(minor, input_name, exported_name,
+                                     EXPORT_NAME_FLAG_OID |
+                                     EXPORT_NAME_FLAG_COMPOSITE);
+
+    GSSEAP_MUTEX_UNLOCK(&input_name->mutex);
+
+    return major;
 }