From d1cb1a24955fd07b230c9960d1957ef16aa824d3 Mon Sep 17 00:00:00 2001 From: Juuso Alasuutari Date: Sun, 11 Mar 2007 14:37:08 +0000 Subject: wpa_supplicant: made EAP-PSK and EAP-SAKE options mutually exclusive, fixes bug #13518 (cherry picked from commit d860ca4efe52766f250c7f0f4ddbba8f4fe28211) --- net/wpa_supplicant/CONFIGURE | 19 +++++++++++++++---- net/wpa_supplicant/HISTORY | 4 ++++ 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 + * CONFIGURE: Made EAP-PSK and EAP-SAKE options mutually exclusive, + fixes #13518. + 2007-02-01 Juuso Alasuutari * init.d/wpa_supplicant: Added check for wireless extensions, removed redundant iwconfig forks. -- cgit v1.2.3