From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sun, 17 Jan 2010 10:14:17 +0000 (+0200)
Subject: ap: Reorder authsrv_init() to fix IEEE 802.1X initialization
X-Git-Tag: hostap_0_7_2~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43a7fe2e0e614e52fa05ff4d78af91bd4e17d3b2;p=thirdparty%2Fhostap.git

ap: Reorder authsrv_init() to fix IEEE 802.1X initialization

This patch moves the authentication server setup before
IEEE 802.1X initialization. It's because 802.1X already
needs to have a valid SSL context.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 158c9b606..317baf69e 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -564,6 +564,9 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 	if (hostapd_init_wps(hapd, conf))
 		return -1;
 
+	if (authsrv_init(hapd) < 0)
+		return -1;
+
 	if (ieee802_1x_init(hapd)) {
 		wpa_printf(MSG_ERROR, "IEEE 802.1X initialization failed.");
 		return -1;
@@ -597,9 +600,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 
 	ieee802_11_set_beacon(hapd);
 
-	if (authsrv_init(hapd) < 0)
-		return -1;
-
 	return 0;
 }