hostapd: allow using iapp for any encryption type (fixes #18022)

[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 7cdcb52..c508693 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -161,7 +161,8 @@ 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 rsn_preauth
+               macfilter ssid wmm hidden short_preamble rsn_preauth \
+               iapp_interface
 
        set_default isolate 0
        set_default maxassoc 0
@@ -217,7 +218,7 @@ hostapd_set_bss_options() {
                                auth_server auth_secret auth_port \
                                acct_server acct_secret acct_port \
                                dae_client dae_secret dae_port \
-                               nasid iapp_interface ownip \
+                               nasid ownip \
                                eap_reauth_period dynamic_vlan \
                                vlan_tagged_interface
 
@@ -290,7 +291,6 @@ hostapd_set_bss_options() {
                set_default wps_device_type "6-0050F204-1"
                set_default wps_device_name "OpenWrt AP"
                set_default wps_manufacturer "openwrt.org"
-               set_default wps_pin "12345670"
 
                wps_state=2
                [ -n "$wps_configured" ] && wps_state=1
@@ -298,7 +298,7 @@ hostapd_set_bss_options() {
                [ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N"
 
                append bss_conf "eap_server=1" "$N"
-               append bss_conf "ap_pin=$wps_pin" "$N"
+               [ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N"
                append bss_conf "wps_state=$wps_state" "$N"
                append bss_conf "ap_setup_locked=0" "$N"
                append bss_conf "device_type=$wps_device_type" "$N"
@@ -417,7 +417,7 @@ _wpa_supplicant_common() {
 
 wpa_supplicant_teardown_interface() {
        _wpa_supplicant_common "$1"
-       rm -rf "$_rpath" "$_config"
+       rm -rf "$_rpath/$1" "$_config"
 }
 
 wpa_supplicant_prepare_interface() {