Merge branch 'windows'

[moonshot.git] / moonshot / mech_eap / util_name.c

diff --git a/moonshot/mech_eap/util_name.c b/moonshot/mech_eap/util_name.c
index 0e7d004..6f038ef 100644 (file)
--- a/moonshot/mech_eap/util_name.c
+++ b/moonshot/mech_eap/util_name.c
@@ -81,7 +81,7 @@ gssEapAllocName(OM_uint32 *minor, gss_name_t *pName)
     }
 
     if (GSSEAP_MUTEX_INIT(&name->mutex) != 0) {
-        *minor = errno;
+        *minor = GSSEAP_GET_LAST_ERROR();
         gssEapReleaseName(&tmpMinor, &name);
         return GSS_S_FAILURE;
     }
@@ -427,19 +427,18 @@ gssEapImportNameInternal(OM_uint32 *minor,
     name->mechanismUsed = mechanismUsed;
     mechanismUsed = GSS_C_NO_OID;
 
+#ifdef GSSEAP_ENABLE_ACCEPTOR
     if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
         gss_buffer_desc buf;
 
         buf.length = remain;
         buf.value = p;
-#ifdef GSSEAP_ENABLE_ACCEPTOR
+
         major = gssEapImportAttrContext(minor, &buf, name);
-#else
-               major = GSS_S_UNAVAILABLE;
-#endif
         if (GSS_ERROR(major))
             goto cleanup;
     }
+#endif
 
     major = GSS_S_COMPLETE;
     *minor = 0;
@@ -569,16 +568,14 @@ gssEapExportNameInternal(OM_uint32 *minor,
         exportedNameLen += 6 + mech->length;
     }
     exportedNameLen += 4 + nameBuf.length;
-    if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
 #ifdef GSSEAP_ENABLE_ACCEPTOR
+    if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
         major = gssEapExportAttrContext(minor, name, &attrs);
-#else
-               major = GSS_S_UNAVAILABLE;
-#endif
         if (GSS_ERROR(major))
             goto cleanup;
         exportedNameLen += attrs.length;
     }
+#endif
 
     exportedName->value = GSSEAP_MALLOC(exportedNameLen);
     if (exportedName->value == NULL) {
@@ -678,15 +675,13 @@ gssEapCanonicalizeName(OM_uint32 *minor,
         goto cleanup;
     }
 
-    if (input_name->attrCtx != NULL) {
 #ifdef GSSEAP_ENABLE_ACCEPTOR
+    if (input_name->attrCtx != NULL) {
         major = gssEapDuplicateAttrContext(minor, input_name, name);
-#else
-               major = GSS_S_UNAVAILABLE;
-#endif
         if (GSS_ERROR(major))
             goto cleanup;
     }
+#endif
 
     *dest_name = name;