aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-05 11:55:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-05 11:55:36 +0000
commitc20bb27aad5f9d1f1acdf2fffe2583f95f3b3bd7 (patch)
tree842bd8ed684226e4e305af71b1cca9e0d202d09c
parentac69d576b458462106fd1738e4afda49a51b0b3c (diff)
downloadupstream-c20bb27aad5f9d1f1acdf2fffe2583f95f3b3bd7.tar.gz
upstream-c20bb27aad5f9d1f1acdf2fffe2583f95f3b3bd7.tar.bz2
upstream-c20bb27aad5f9d1f1acdf2fffe2583f95f3b3bd7.zip
hostapd: move reading of rsn_preauth out of auth_type=eap context
rsn_preauth is used outside of "case $auth_type", so if it is set for an EAP-enabled SSID, it would also be set for the following non-EAP-enabled SSIDs, because it would not be read again. Signed-off-by: Reiner Herrmann <reiner@reiner-h.de> SVN-Revision: 41012
-rw-r--r--package/network/services/hostapd/files/netifd.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index a36a0697d8..8b5e731d7b 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -152,7 +152,7 @@ hostapd_set_bss_options() {
maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
wps_device_type wps_device_name wps_manufacturer wps_pin \
- macfilter ssid wmm hidden short_preamble
+ macfilter ssid wmm hidden short_preamble rsn_preauth
set_default isolate 0
set_default maxassoc 0
@@ -208,8 +208,8 @@ hostapd_set_bss_options() {
auth_server auth_secret auth_port \
acct_server acct_secret acct_port \
dae_client dae_secret dae_port \
- nasid rsn_preauth iapp_interface \
- ownip eap_reauth_period
+ nasid iapp_interface ownip \
+ eap_reauth_period
# legacy compatibility
[ -n "$auth_server" ] || json_get_var auth_server server