From 7af471919a25bd20b0f49024e6653da41ece20f0 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Sat, 16 Sep 2017 11:59:46 +0200 Subject: [PATCH] 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 --- clients/cli/devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 8573db5e69..467ce427d2 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); }