Merge branch 'windows'

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

diff --git a/moonshot/mech_eap/import_sec_context.c b/moonshot/mech_eap/import_sec_context.c
index 8854bf4..a2a712c 100644 (file)
--- a/moonshot/mech_eap/import_sec_context.c
+++ b/moonshot/mech_eap/import_sec_context.c
@@ -305,6 +305,7 @@ gssEapImportContext(OM_uint32 *minor,
     major = sequenceInternalize(minor, &ctx->seqState, &p, &remain);
     if (GSS_ERROR(major))
         return major;
+
 #ifdef GSSEAP_ENABLE_ACCEPTOR
     /*
      * The partial context should only be expected for unestablished
@@ -316,11 +317,11 @@ gssEapImportContext(OM_uint32 *minor,
         if (GSS_ERROR(major))
             return major;
     }
-#endif
 
 #ifdef GSSEAP_DEBUG
     assert(remain == 0);
 #endif
+#endif /* GSSEAP_ENABLE_ACCEPTOR */
 
     major = GSS_S_COMPLETE;
     *minor = 0;
@@ -328,7 +329,7 @@ gssEapImportContext(OM_uint32 *minor,
     return major;
 }
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32 GSSAPI_CALLCONV
 gss_import_sec_context(OM_uint32 *minor,
                        gss_buffer_t interprocess_token,
                        gss_ctx_id_t *context_handle)