hostapd: allow multiple key management algorithms

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

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 26a255f..a5abdce 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -169,7 +169,7 @@ hostapd_set_bss_options() {
        wireless_vif_parse_encryption
 
        local bss_conf
-       local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey
+       local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt
 
        json_get_vars \
                wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \
@@ -233,6 +233,7 @@ hostapd_set_bss_options() {
                                append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
                        }
                        wps_possible=1
+                       append wpa_key_mgmt "WPA-PSK"
                ;;
                eap)
                        json_get_vars \
@@ -276,7 +277,7 @@ hostapd_set_bss_options() {
                        [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
                        append bss_conf "eapol_key_index_workaround=1" "$N"
                        append bss_conf "ieee8021x=1" "$N"
-                       append bss_conf "wpa_key_mgmt=WPA-EAP" "$N"
+                       append wpa_key_mgmt "WPA-EAP"
 
                        [ -n "$dynamic_vlan" ] && {
                                append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
@@ -341,6 +342,7 @@ hostapd_set_bss_options() {
        if [ "$wpa" -ge "1" ]; then
                json_get_vars nasid
                [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
+               [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
        fi
 
        if [ "$wpa" -ge "2" ]; then