From: Jouni Malinen <j@w1.fi>
Date: Tue, 6 Dec 2011 10:47:17 +0000 (+0200)
Subject: Revert "EAP server: Force identity request after INITIALIZE for passthrough"
X-Git-Tag: aosp-jb-start~182
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4a9e26b6e712b21f2ab6f417382a33682efa4795;p=thirdparty%2Fhostap.git

Revert "EAP server: Force identity request after INITIALIZE for passthrough"

This reverts commit 204dd3f420bb1ddce02d13d7a366169e0bda914d.
start_reauth was not supposed to be used in this way and setting it
to TRUE in INITIALIZE breaks internal EAP server.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/src/eap_server/eap_server.c b/src/eap_server/eap_server.c
index 0f4284f7f..4483508ce 100644
--- a/src/eap_server/eap_server.c
+++ b/src/eap_server/eap_server.c
@@ -169,13 +169,6 @@ SM_STATE(EAP, INITIALIZE)
 	sm->num_rounds = 0;
 	sm->method_pending = METHOD_PENDING_NONE;
 
-	/*
-	 * Start reauthentication with identity request even though we know the
-	 * previously used identity. This is needed to get reauthentication
-	 * started properly.
-	 */
-	sm->start_reauth = TRUE;
-
 	wpa_msg(sm->msg_ctx, MSG_INFO, WPA_EVENT_EAP_STARTED
 		MACSTR, MAC2STR(sm->peer_addr));
 }
@@ -596,6 +589,13 @@ SM_STATE(EAP, SUCCESS2)
 	}
 
 	sm->eap_if.eapSuccess = TRUE;
+
+	/*
+	 * Start reauthentication with identity request even though we know the
+	 * previously used identity. This is needed to get reauthentication
+	 * started properly.
+	 */
+	sm->start_reauth = TRUE;
 }