From: Blaž Bačnik <bacnik@gmail.com>
Date: Wed, 30 Sep 2009 17:44:04 +0000 (+0300)
Subject: Fix VLAN ID validation check to use the new VLAN ID
X-Git-Tag: hostap_0_7_0~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1066c1ee3c8a786f688a46f9d3be8ebfd27580de;p=thirdparty%2Fhostap.git

Fix VLAN ID validation check to use the new VLAN ID

When checking the validity of VLAN ID based on RADIUS-based ACL or
accept_mac_file, the assigned vlan_id, not the old sta->vlan_id
(likely zero) needs to be used.
---

diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index 394dfab74..f2e793c90 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -585,7 +585,7 @@ static void handle_auth(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
 
 	if (vlan_id > 0) {
 		if (hostapd_get_vlan_id_ifname(hapd->conf->vlan,
-					       sta->vlan_id) == NULL) {
+					       vlan_id) == NULL) {
 			hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_RADIUS,
 				       HOSTAPD_LEVEL_INFO, "Invalid VLAN ID "
 				       "%d received from RADIUS server",