Hello

To follow this change in openwrt
https://dev.openwrt.org/changeset/26482/trunk/package/hostapd/files/hostapd.sh
and this change in luci
http://luci.subsignal.org/trac/changeset/7599/luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua

Signed-off-by: Etienne CHAMPETIER <[email protected]>



Index: package/broadcom-wl/files/lib/wifi/broadcom.sh
===================================================================
--- package/broadcom-wl/files/lib/wifi/broadcom.sh      (révision 29117)
+++ package/broadcom-wl/files/lib/wifi/broadcom.sh      (copie de travail)
@@ -245,9 +245,12 @@
                        *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 @@
                                # 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"

_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to