Author: nbd Date: 2014-09-15 18:09:23 +0200 (Mon, 15 Sep 2014) New Revision: 42553
Modified: trunk/package/network/services/hostapd/files/hostapd.sh trunk/package/network/services/hostapd/files/netifd.sh Log: hostapd: remove bogus default setting for wps_pin (#17873) Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/network/services/hostapd/files/hostapd.sh =================================================================== --- trunk/package/network/services/hostapd/files/hostapd.sh 2014-09-15 10:19:38 UTC (rev 42552) +++ trunk/package/network/services/hostapd/files/hostapd.sh 2014-09-15 16:09:23 UTC (rev 42553) @@ -196,13 +196,13 @@ 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" Modified: trunk/package/network/services/hostapd/files/netifd.sh =================================================================== --- trunk/package/network/services/hostapd/files/netifd.sh 2014-09-15 10:19:38 UTC (rev 42552) +++ trunk/package/network/services/hostapd/files/netifd.sh 2014-09-15 16:09:23 UTC (rev 42553) @@ -290,7 +290,6 @@ 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 @@ [ "$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" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
