diff options
| author | Florian Fainelli <florian@openwrt.org> | 2008-08-13 13:30:27 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2008-08-13 13:30:27 +0000 |
| commit | dbb59f014a1fc3d08c145c182f07cad0dde4d204 (patch) | |
| tree | 45b3f438c3b95f232833720a4984f5e296a5ab99 | |
| parent | 8c8b85b54c38de89392342c4959de0ae49afd148 (diff) | |
| download | upstream-dbb59f014a1fc3d08c145c182f07cad0dde4d204.tar.gz upstream-dbb59f014a1fc3d08c145c182f07cad0dde4d204.tar.bz2 upstream-dbb59f014a1fc3d08c145c182f07cad0dde4d204.zip | |
Fix a bug when parsing ca_cert and eap_type with wpa_supplicant, this should only be set for 802.1x setups
SVN-Revision: 12292
| -rw-r--r-- | package/wpa_supplicant/files/wpa_supplicant.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/wpa_supplicant/files/wpa_supplicant.sh b/package/wpa_supplicant/files/wpa_supplicant.sh index 192c903540..37ebef7a4b 100644 --- a/package/wpa_supplicant/files/wpa_supplicant.sh +++ b/package/wpa_supplicant/files/wpa_supplicant.sh @@ -32,6 +32,7 @@ wpa_supplicant_setup_vif() { proto='WPA2' key_mgmt='WPA-EAP' config_get ca_cert "$vif" ca_cert + ca_cert="ca_cert=\"$ca_cert\"" case "$eap_type" in tls|TLS) pairwise='pairwise=CCMP' @@ -50,12 +51,12 @@ wpa_supplicant_setup_vif() { password="password=\"$password\"" ;; esac + eap_type="eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')" ;; esac config_get ifname "$vif" ifname config_get bridge "$vif" bridge config_get ssid "$vif" ssid - eap_type=$(echo $eap_type | tr 'a-z' 'A-Z') cat > /var/run/wpa_supplicant-$ifname.conf <<EOF network={ scan_ssid=1 @@ -65,8 +66,8 @@ network={ $passphrase $pairwise $group - eap=$eap_type - ca_cert="$ca_cert" + $eap_type + $ca_cert $priv_key $priv_key_pwd $phase2 |