ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix unparsable options generated by wpa_supplicant.sh (#4835)

Browse Source 
SVN-Revision: 15058
This commit is contained in:
Jo-Philipp Wich 2009-03-28 21:30:07 +00:00
parent bad948c277
commit 2a59f52a0f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/wpa_supplicant/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wpa_supplicant PKG_NAME:=wpa_supplicant
PKG_VERSION:=0.6.9 PKG_VERSION:=0.6.9
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MD5SUM:=0efb8fcedf0a8acf6f423dfdb0658fdd PKG_MD5SUM:=0efb8fcedf0a8acf6f423dfdb0658fdd
PKG_SOURCE_URL:=http://hostap.epitest.fi/releases PKG_SOURCE_URL:=http://hostap.epitest.fi/releases

7
package/wpa_supplicant/files/wpa_supplicant.sh
View File

@ -32,7 +32,7 @@ wpa_supplicant_setup_vif() {
proto='WPA2' proto='WPA2'
key_mgmt='WPA-EAP' key_mgmt='WPA-EAP'
config_get ca_cert "$vif" ca_cert config_get ca_cert "$vif" ca_cert
ca_cert="ca_cert=\"$ca_cert\"" ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
case "$eap_type" in case "$eap_type" in
tls|TLS) tls|TLS)
pairwise='pairwise=CCMP' pairwise='pairwise=CCMP'
@ -51,17 +51,20 @@ wpa_supplicant_setup_vif() {
password="password=\"$password\"" password="password=\"$password\""
;; ;;
esac esac
eap_type="eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')" eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
;; ;;
esac esac
config_get ifname "$vif" ifname config_get ifname "$vif" ifname
config_get bridge "$vif" bridge config_get bridge "$vif" bridge
config_get ssid "$vif" ssid config_get ssid "$vif" ssid
config_get bssid "$vif" bssid
bssid=${bssid:+"bssid=$bssid"}
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant-$ifname ctrl_interface=/var/run/wpa_supplicant-$ifname
network={ network={
scan_ssid=1 scan_ssid=1
ssid="$ssid" ssid="$ssid"
$bssid
key_mgmt=$key_mgmt key_mgmt=$key_mgmt
proto=$proto proto=$proto
$passphrase $passphrase