hostapd: remove bogus default setting for wps_pin (#17873)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42553 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 2a16bb4..b8ba7bd 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -196,13 +196,13 @@ hostapd_set_bss_options() {
                config_get device_type "$vif" wps_device_type "6-0050F204-1"
                config_get device_name "$vif" wps_device_name "OpenWrt AP"
                config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
-               config_get wps_pin "$vif" wps_pin "12345670"
+               config_get wps_pin "$vif" wps_pin
 
                config_get_bool ext_registrar "$vif" ext_registrar 0
                [ "$ext_registrar" -gt 0 -a -n "$bridge" ] && append "$var" "upnp_iface=$bridge" "$N"
 
                append "$var" "eap_server=1" "$N"
-               append "$var" "ap_pin=$wps_pin" "$N"
+               [ -n "$wps_pin" ] && append "$var" "ap_pin=$wps_pin" "$N"
                append "$var" "wps_state=${wps_not_configured:-2}" "$N"
                append "$var" "ap_setup_locked=0" "$N"
                append "$var" "device_type=$device_type" "$N"

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 7cdcb52..aa44b39 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -290,7 +290,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 +297,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"