diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-09-15 16:09:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-15 16:09:23 +0000 |
| commit | 9fad4bd83bf08505c2dadc8dd26a9e7d0276c3b7 (patch) | |
| tree | 0fbb840f42b02675fef0ea6aceadc9f504b0d4b5 /package/network | |
| parent | ba33fec925ccd1a96921437a31a1ca49352d0595 (diff) | |
| download | master-187ad058-9fad4bd83bf08505c2dadc8dd26a9e7d0276c3b7.tar.gz master-187ad058-9fad4bd83bf08505c2dadc8dd26a9e7d0276c3b7.tar.bz2 master-187ad058-9fad4bd83bf08505c2dadc8dd26a9e7d0276c3b7.zip | |
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
Diffstat (limited to 'package/network')
| -rw-r--r-- | package/network/services/hostapd/files/hostapd.sh | 4 | ||||
| -rw-r--r-- | package/network/services/hostapd/files/netifd.sh | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 2a16bb4602..b8ba7bdf05 100644 --- 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 7cdcb52c3d..aa44b393c3 100644 --- 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" |