From dc052fc1f4158e0b7df14b471049054299cc8cc6 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 27 Oct 2010 11:12:25 +0000 Subject: [PATCH] [backfire] merge r23655 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23656 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/hostapd/files/hostapd.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index fdb047be6..ebe44c209 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -76,7 +76,6 @@ hostapd_set_bss_options() { append "$var" "eapol_key_index_workaround=1" "$N" append "$var" "radius_acct_interim_interval=300" "$N" append "$var" "ieee8021x=1" "$N" - append "$var" "auth_algs=1" "$N" append "$var" "wpa_key_mgmt=WPA-EAP" "$N" append "$var" "wpa_group_rekey=300" "$N" append "$var" "wpa_gmk_rekey=640" "$N" @@ -100,6 +99,14 @@ hostapd_set_bss_options() { append "$var" "wep_default_key=0" "$N" ;; esac + case "$enc" in + *shared*) + auth_algs=2 + ;; + *mixed*) + auth_algs=3 + ;; + esac wpa=0 crypto= ;; @@ -108,6 +115,7 @@ hostapd_set_bss_options() { crypto= ;; esac + append "$var" "auth_algs=${auth_algs:-1}" "$N" append "$var" "wpa=$wpa" "$N" [ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N" [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"