From d3401e115b8adde974567ec4577a88658fb895e5 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Sat, 12 Mar 2011 14:44:35 +1100
Subject: [PATCH] Cleanup builds without reauth

---
 init_sec_context.c | 12 +++++++-----
 util.h             |  2 ++
 util_sm.c          |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/init_sec_context.c b/init_sec_context.c
index bd97e35..e2aa259 100644
--- a/init_sec_context.c
+++ b/init_sec_context.c
@@ -573,18 +573,17 @@ eapGssSmInitIdentity(OM_uint32 *minor,
 {
     struct eap_config eapConfig;
 
+#ifdef GSSEAP_ENABLE_REAUTH
     if (GSSEAP_SM_STATE(ctx) == GSSEAP_STATE_REAUTHENTICATE) {
         OM_uint32 tmpMinor;
 
         /* server didn't support reauthentication, sent EAP request */
-#ifdef GSSEAP_ENABLE_REAUTH
         gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
-#endif
         ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
         GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
-    } else {
+    } else
+#endif
         *smFlags |= SM_FLAG_FORCE_SEND_TOKEN;
-    }
 
     assert((ctx->flags & CTX_FLAG_KRB_REAUTH) == 0);
     assert(inputToken == GSS_C_NO_BUFFER);
@@ -833,7 +832,10 @@ static struct gss_eap_sm eapGssInitiatorSm[] = {
     {
         ITOK_TYPE_NONE,
         ITOK_TYPE_NONE,
-        GSSEAP_STATE_INITIAL | GSSEAP_STATE_REAUTHENTICATE,
+#ifdef GSSEAP_ENABLE_REAUTH
+        GSSEAP_STATE_REAUTHENTICATE |
+#endif
+        GSSEAP_STATE_INITIAL,
         SM_ITOK_FLAG_REQUIRED,
         eapGssSmInitIdentity
     },
diff --git a/util.h b/util.h
index e719243..e6c08ef 100644
--- a/util.h
+++ b/util.h
@@ -540,7 +540,9 @@ enum gss_eap_state {
     GSSEAP_STATE_AUTHENTICATE   = 0x02,     /* exchange EAP messages */
     GSSEAP_STATE_INITIATOR_EXTS = 0x04,     /* initiator extensions */
     GSSEAP_STATE_ACCEPTOR_EXTS  = 0x08,     /* acceptor extensions */
+#ifdef GSSEAP_ENABLE_REAUTH
     GSSEAP_STATE_REAUTHENTICATE = 0x10,     /* GSS reauthentication messages */
+#endif
     GSSEAP_STATE_ESTABLISHED    = 0x20,     /* context established */
     GSSEAP_STATE_ALL            = 0x3F
 };
diff --git a/util_sm.c b/util_sm.c
index 59d0679..ca69923 100644
--- a/util_sm.c
+++ b/util_sm.c
@@ -64,9 +64,11 @@ gssEapStateToString(enum gss_eap_state state)
     case GSSEAP_STATE_ACCEPTOR_EXTS:
         s = "ACCEPTOR_EXTS";
         break;
+#ifdef GSSEAP_ENABLE_REAUTH
     case GSSEAP_STATE_REAUTHENTICATE:
         s = "REAUTHENTICATE";
         break;
+#endif
     case GSSEAP_STATE_ESTABLISHED:
         s = "ESTABLISHED";
         break;
-- 
2.1.4