fix up state machine, some compile ints

[mech_eap.orig] / import_sec_context.c

diff --git a/import_sec_context.c b/import_sec_context.c
index 648bff5..751ed54 100644 (file)
--- a/import_sec_context.c
+++ b/import_sec_context.c
@@ -170,7 +170,7 @@ importName(OM_uint32 *minor,
         tmp.value = p + 4;
 
         major = gssEapImportNameInternal(minor, &tmp, pName,
-                                         EXPORT_NAME_FLAG_ATTRS);
+                                         EXPORT_NAME_FLAG_COMPOSITE);
         if (GSS_ERROR(major))
             return major;
     }
@@ -206,7 +206,7 @@ gssEapImportContext(OM_uint32 *minor,
     remain -= 16;
 
     /* Validate state */
-    if (ctx->state < EAP_STATE_AUTHENTICATE ||
+    if (ctx->state < EAP_STATE_IDENTITY ||
         ctx->state > EAP_STATE_ESTABLISHED)
         return GSS_S_DEFECTIVE_TOKEN;
 
@@ -264,7 +264,9 @@ gssEapImportContext(OM_uint32 *minor,
             return major;
     }
 
+#ifdef GSSEAP_DEBUG
     assert(remain == 0);
+#endif
 
     *minor = 0;
     major = GSS_S_COMPLETE;