From: Luke Howard <lukeh@padl.com>
Date: Wed, 9 Mar 2011 14:32:25 +0000 (+1100)
Subject: remove SM_FLAG_STOP_EVAL, unused
X-Git-Tag: vm/20110310~7
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=2ff0d10fe391019fdc2dfaf876ae4ba80b766613

remove SM_FLAG_STOP_EVAL, unused
---

diff --git a/util.h b/util.h
index e7ba9f9..4936222 100644
--- a/util.h
+++ b/util.h
@@ -577,10 +577,9 @@ struct gss_eap_sm {
 };
 
 /* state machine flags, set by handler */
-#define SM_FLAG_FORCE_SEND_TOKEN            0x00000001  /* send token even if empty */
-#define SM_FLAG_STOP_EVAL                   0x00000002  /* no more handlers for this state */
-#define SM_FLAG_RESTART                     0x00000004  /* restart state machine */
-#define SM_FLAG_OUTPUT_TOKEN_CRITICAL       0x00000008  /* output token is critical */
+#define SM_FLAG_FORCE_SEND_TOKEN            0x00000001  /* send token even if no inner tokens */
+#define SM_FLAG_RESTART                     0x00000002  /* restart state machine */
+#define SM_FLAG_OUTPUT_TOKEN_CRITICAL       0x00000004  /* output token is critical */
 
 /* state machine flags, set by state machine */
 #define SM_FLAG_INPUT_TOKEN_CRITICAL        0x40000000  /* input token was critical */
diff --git a/util_sm.c b/util_sm.c
index de730ce..3a3e1f5 100644
--- a/util_sm.c
+++ b/util_sm.c
@@ -329,12 +329,10 @@ gssEapSmStep(OM_uint32 *minor,
                 innerOutputTokens->count++;
             }
             /*
-             * Break out if explicitly requested, or if we made a state transition
-             * and have some tokens to send.
+             * Break out if we made a state transition and have some tokens to send.
              */
-            if ((smFlags & SM_FLAG_STOP_EVAL) ||
-                ((smFlags & SM_FLAG_TRANSITED) &&
-                 ((smFlags & SM_FLAG_FORCE_SEND_TOKEN) || innerOutputTokens->count != 0))) {
+            if ((smFlags & SM_FLAG_TRANSITED) &&
+                 ((smFlags & SM_FLAG_FORCE_SEND_TOKEN) || innerOutputTokens->count != 0)) {
                 SM_ASSERT_VALID(ctx, major);
                 break;
             }