aboutsummaryrefslogtreecommitdiffstats
path: root/src/ap
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-01-17 10:14:17 (GMT)
committerJouni Malinen <j@w1.fi>2010-01-17 10:14:17 (GMT)
commit43a7fe2e0e614e52fa05ff4d78af91bd4e17d3b2 (patch)
treeeb9bf1908fda76013ed5bbfbd4e156052bf3e2b7 /src/ap
parentdff0f701d0f280f93c5c7698ef0f8e16dbbe815a (diff)
downloadhostap-43a7fe2e0e614e52fa05ff4d78af91bd4e17d3b2.zip
hostap-43a7fe2e0e614e52fa05ff4d78af91bd4e17d3b2.tar.gz
hostap-43a7fe2e0e614e52fa05ff4d78af91bd4e17d3b2.tar.bz2
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>
Diffstat (limited to 'src/ap')
-rw-r--r--src/ap/hostapd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 158c9b6..317baf6 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;
}