Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d860ca4efe52766f250c7f0f4ddbba8f4fe28211)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d860ca4efe52766f250c7f0f4ddbba8f4fe28211)
  • Date: Sun, 11 Mar 2007 09:38:10 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

net/wpa_supplicant/CONFIGURE | 19 +++++++++++++++----
net/wpa_supplicant/HISTORY | 4 ++++
2 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit d860ca4efe52766f250c7f0f4ddbba8f4fe28211
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

wpa_supplicant: made EAP-PSK and EAP-SAKE options mutually exclusive,
fixes bug #13518

diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 70a4a2a..014f41e 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -79,13 +79,24 @@ config_query CONFIG_EAP_GTC "EAP-GTC s
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 95647e8..86f0089 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2007-03-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Made EAP-PSK and EAP-SAKE options mutually exclusive,
+ fixes #13518.
+
2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
* PRE_BUILD: Replace bad TRACK_ROOT usage (automated).




  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d860ca4efe52766f250c7f0f4ddbba8f4fe28211), Juuso Alasuutari, 03/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page