aboutsummaryrefslogtreecommitdiffstats
path: root/package/broadcom-wl/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-14 21:37:53 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-14 21:37:53 +0000
commitf87c8c3733027778e813302377f73085e4176bdd (patch)
treef3532fd7ca3ba9fa4c83c16970f5c8a70adba7da /package/broadcom-wl/files
parent73c7e70a0b9879ef65e1b2eb01fcf582513f85a4 (diff)
downloadmaster-187ad058-f87c8c3733027778e813302377f73085e4176bdd.tar.gz
master-187ad058-f87c8c3733027778e813302377f73085e4176bdd.tar.bz2
master-187ad058-f87c8c3733027778e813302377f73085e4176bdd.zip
[package] broadcom-wl: align RADIUS options with r26482, patch by Etienne Champetier <etienne.champetier@free.fr>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29136 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-wl/files')
-rw-r--r--package/broadcom-wl/files/lib/wifi/broadcom.sh13
1 files changed, 8 insertions, 5 deletions
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 8fe801d59b..0f639e1bc1 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -245,9 +245,12 @@ enable_broadcom() {
*wpa*)
wsec_r=1
eap_r=1
- config_get key "$vif" key
- config_get server "$vif" server
- config_get port "$vif" port
+ config_get auth_server "$vif" auth_server
+ [ -z "$auth_server" ] && config_get auth_server "$vif" server
+ config_get auth_port "$vif" auth_port
+ [ -z "$auth_port" ] && config_get auth_port "$vif" port
+ config_get auth_secret "$vif" auth_secret
+ [ -z "$auth_secret" ] && config_get auth_secret "$vif" key
# wpa version + default cipher
case "$enc" in
@@ -266,8 +269,8 @@ enable_broadcom() {
# group rekey interval
config_get rekey "$vif" wpa_group_rekey
- eval "${vif}_key=\"\$key\""
- nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}${rekey:+ -g $rekey}"
+ eval "${vif}_key=\"\$auth_secret\""
+ nasopts="-r \"\$${vif}_key\" -h $auth_server -p ${auth_port:-1812}${rekey:+ -g $rekey}"
;;
esac
append vif_do_up "wsec $wsec" "$N"