summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Alasuutari2007-03-11 14:37:08 +0000
committerJeremy Blosser2007-03-15 11:52:58 -0500
commitd1cb1a24955fd07b230c9960d1957ef16aa824d3 (patch)
tree6950302b5c9e3130b0475e00faa78105ad6cfc83
parent764730658d1fa61b96c5a0a9e45b62c30a13976e (diff)
wpa_supplicant: made EAP-PSK and EAP-SAKE options mutually exclusive,stable-rc-0.8
fixes bug #13518 (cherry picked from commit d860ca4efe52766f250c7f0f4ddbba8f4fe28211)
-rwxr-xr-xnet/wpa_supplicant/CONFIGURE19
-rw-r--r--net/wpa_supplicant/HISTORY4
2 files changed, 19 insertions, 4 deletions
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 70a4a2a923..014f41e6d0 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -79,13 +79,24 @@ config_query CONFIG_EAP_GTC "EAP-GTC support?" y &&
config_query CONFIG_EAP_OTP "EAP-OTC support?" y &&
config_query CONFIG_EAP_SIM "EAP-SIM (GSM) support?" n &&
config_query CONFIG_EAP_AKA "EAP-AKA (UMTS) support?" n &&
-config_query CONFIG_EAP_PSK "EAP-PSK support?" n &&
-config_query CONFIG_EAP_PAX "EAP-PAX support?" n &&
-config_query CONFIG_EAP_LEAP "LEAP support?" y &&
+if [[ $WPA_RELEASE != old ]]
+then
+ message "${MESSAGE_COLOR}Notice: EAP-PSK and EAP-SAKE" \
+ "options are mutually exclusive.$DEFAULT_COLOR"
+fi &&
+config_query CONFIG_EAP_PSK "EAP-PSK support?" n &&
+config_query CONFIG_EAP_PAX "EAP-PAX support?" n &&
+config_query CONFIG_EAP_LEAP "LEAP support?" y &&
if [[ $WPA_RELEASE != old ]]
then
- config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n &&
+ if [[ $CONFIG_EAP_PSK != y ]]
+ then
+ config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n
+ else
+ message "${MESSAGE_COLOR}EAP-PSK was selected, will" \
+ "not query about EAP-SAKE.$DEFAULT_COLOR"
+ fi &&
config_query CONFIG_EAP_GPSK "EAP-GPSK support?" n &&
if [[ $CONFIG_EAP_GPSK == y ]]
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index c29231ec92..dec622c3f0 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2007-03-11 Juuso Alasuutari <iuso@sourcemage.org>
+ * CONFIGURE: Made EAP-PSK and EAP-SAKE options mutually exclusive,
+ fixes #13518.
+
2007-02-01 Juuso Alasuutari <iuso@sourcemage.org>
* init.d/wpa_supplicant: Added check for wireless extensions,
removed redundant iwconfig forks.