summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-09-16 11:59:46 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2017-09-20 09:23:54 +0200
commit7af471919a25bd20b0f49024e6653da41ece20f0 (patch)
tree19dc009fb0e189d8f164bdc1a9ee37895442f655
parent05618aaaf388c03f9eea31b6a42f666868988c51 (diff)
cli: wifi: connect with PSK when the AP supports WPA-PSK and WPA-EAP
'nmcli device wifi connect' only supports WEP and WPA-PSK at the moment, but not WPA-EAP. If the AP supports both WPA-PSK and WPA-EAP, nmcli doesn't add the PSK to the connection, causing a connection failure. Fix this. https://bugzilla.redhat.com/show_bug.cgi?id=1492064
-rw-r--r--clients/cli/devices.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 8573db5e6..467ce427d 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -3182,8 +3182,8 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE,
wep_passphrase ? NM_WEP_KEY_TYPE_PASSPHRASE: NM_WEP_KEY_TYPE_KEY,
NULL);
- } else if ( !(ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
- && !(ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
+ } else if ( (ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+ || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) {
/* WPA PSK */
g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK, password, NULL);
}