hostapd: append nasid to config for all WPA types

[openwrt/staging/florian.git] / package / network / services / hostapd / files / hostapd.sh

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index b8ba7bdf05db141094e087b6494ef9871e4c45c3..2a38d16255f9a095c1c31c3529d017142545de56 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -129,9 +129,7 @@ hostapd_set_bss_options() {
                                append "$var" "radius_das_port=${dae_port:-3799}" "$N"
                                append "$var" "radius_das_client=$dae_client $dae_secret" "$N"
                        }
-                       config_get nasid "$vif" nasid
                        config_get ownip "$vif" ownip
-                       append "$var" "nas_identifier=$nasid" "$N"
                        append "$var" "own_ip_addr=$ownip" "$N"
                        append "$var" "eapol_key_index_workaround=1" "$N"
                        append "$var" "ieee8021x=1" "$N"
@@ -216,6 +214,12 @@ hostapd_set_bss_options() {
        [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
        [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N"
 
+       if [ "$wpa" -ge "1" ]
+       then
+               config_get nasid "$vif" nasid
+               [ -n "$nasid" ] && append "$var" "nas_identifier=$nasid" "$N"
+       fi
+
        if [ "$wpa" -ge "2" ]
        then
                # RSN -> allow preauthentication. You have two