Changeset 42553


Ignore:
Timestamp:
2014-09-15T18:09:23+02:00 (3 years ago)
Author:
nbd
Message:

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

Signed-off-by: Felix Fietkau <nbd@…>

Location:
trunk/package/network/services/hostapd/files
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/hostapd/files/hostapd.sh

    r40934 r42553  
    197197                config_get device_name "$vif" wps_device_name "OpenWrt AP" 
    198198                config_get manufacturer "$vif" wps_manufacturer "openwrt.org" 
    199                 config_get wps_pin "$vif" wps_pin "12345670" 
     199                config_get wps_pin "$vif" wps_pin 
    200200 
    201201                config_get_bool ext_registrar "$vif" ext_registrar 0 
     
    203203 
    204204                append "$var" "eap_server=1" "$N" 
    205                 append "$var" "ap_pin=$wps_pin" "$N" 
     205                [ -n "$wps_pin" ] && append "$var" "ap_pin=$wps_pin" "$N" 
    206206                append "$var" "wps_state=${wps_not_configured:-2}" "$N" 
    207207                append "$var" "ap_setup_locked=0" "$N" 
  • trunk/package/network/services/hostapd/files/netifd.sh

    r42111 r42553  
    291291                set_default wps_device_name "OpenWrt AP" 
    292292                set_default wps_manufacturer "openwrt.org" 
    293                 set_default wps_pin "12345670" 
    294293 
    295294                wps_state=2 
     
    299298 
    300299                append bss_conf "eap_server=1" "$N" 
    301                 append bss_conf "ap_pin=$wps_pin" "$N" 
     300                [ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N" 
    302301                append bss_conf "wps_state=$wps_state" "$N" 
    303302                append bss_conf "ap_setup_locked=0" "$N" 
Note: See TracChangeset for help on using the changeset viewer.