aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-16 13:23:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-16 13:23:37 +0000
commit511f2b5f6d6152cd677ee00c2f61584c47eeb542 (patch)
treedc35dfe0201cc8309da8af9d35cf0f5dd6c1631e
parent631fa2c18c198add89566fdbcab66ccab80b126a (diff)
downloadmaster-187ad058-511f2b5f6d6152cd677ee00c2f61584c47eeb542.tar.gz
master-187ad058-511f2b5f6d6152cd677ee00c2f61584c47eeb542.tar.bz2
master-187ad058-511f2b5f6d6152cd677ee00c2f61584c47eeb542.zip
wpa_supplicant.sh: always use parameters from the current section
Using variables from the outer scope unnecessarily complicates the code and leads to issues. This patch fixes the bug when having an "adhoc" wifi-iface section before a "sta" section prevents wpa_supplicant from using the key specified in the corresponding section as it tries to use the "adhoc" key instead (1 by default). Signed-off-by: Paul Fertser <fercerpav@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34716 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/services/hostapd/files/wpa_supplicant.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/package/network/services/hostapd/files/wpa_supplicant.sh b/package/network/services/hostapd/files/wpa_supplicant.sh
index 928243e425..127c5a70f5 100644
--- a/package/network/services/hostapd/files/wpa_supplicant.sh
+++ b/package/network/services/hostapd/files/wpa_supplicant.sh
@@ -9,13 +9,8 @@ wpa_supplicant_setup_vif() {
local scan_ssid="1"
[ -n "$4" ] && freq="frequency=$4"
- # make sure we have the encryption type and the psk
- [ -n "$enc" ] || {
- config_get enc "$vif" encryption
- }
- [ -n "$key" ] || {
- config_get key "$vif" key
- }
+ config_get enc "$vif" encryption
+ config_get key "$vif" key
local net_cfg bridge
config_get bridge "$vif" bridge