Fix a bug when parsing ca_cert and eap_type with wpa_supplicant, this should only...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12292 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/wpa_supplicant/files/wpa_supplicant.sh b/package/wpa_supplicant/files/wpa_supplicant.sh
index 192c903..37ebef7 100644 (file)
--- 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