diff options
-rwxr-xr-x | net/wpa_supplicant/CONFIGURE | 19 | ||||
-rw-r--r-- | 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 <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. |