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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41012 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index a36a069..8b5e731 100644 (file)
--- 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