hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>

SVN-Revision: 34716
owl
Felix Fietkau 2012-12-16 13:23:37 +00:00
parent e9c0b95829
commit 056d75049d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/network/services/hostapd/files/wpa_supplicant.sh
View File

@ -9,13 +9,8 @@ wpa_supplicant_setup_vif() {
local scan_ssid="1" local scan_ssid="1"
[ -n "$4" ] && freq="frequency=$4" [ -n "$4" ] && freq="frequency=$4"
# make sure we have the encryption type and the psk
[ -n "$enc" ] || {
config_get enc "$vif" encryption config_get enc "$vif" encryption
}
[ -n "$key" ] || {
config_get key "$vif" key config_get key "$vif" key
}
local net_cfg bridge local net_cfg bridge
config_get bridge "$vif" bridge config_get bridge "$vif" bridge