diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-11-09 16:41:59 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-11-09 16:58:06 +0100 |
| commit | 273a63fa8cacc2c3bf0bf87622e01cb4367a810a (patch) | |
| tree | 4f03ff80b3ddd98c09b7d1b681356a792b42a763 | |
| parent | 9f142421f16f03b12f0a65c0b20d147fb6563bd5 (diff) | |
| download | NetworkManager-jk/nmcli-hotspot.tar.gz | |
fixup! cli: add 'nmcli device wifi hotspot' commandjk/nmcli-hotspot
| -rw-r--r-- | clients/cli/devices.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index b35e0f172c..0c38419234 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -2782,22 +2782,21 @@ set_wireless_security_for_hotspot (NMSettingWirelessSecurity *s_wsec, if (g_strcmp0 (wifi_mode, NM_SETTING_WIRELESS_MODE_AP) == 0) { if (caps & NM_WIFI_DEVICE_CAP_RSN) { nm_setting_wireless_security_add_proto (s_wsec, "rsn"); - nm_setting_wireless_security_add_pairwise (s_wsec, "none"); nm_setting_wireless_security_add_pairwise (s_wsec, "ccmp"); nm_setting_wireless_security_add_group (s_wsec, "ccmp"); - key_mgmt = "wpa-none"; + key_mgmt = "wpa-psk"; } else if (caps & NM_WIFI_DEVICE_CAP_WPA) { nm_setting_wireless_security_add_proto (s_wsec, "wpa"); - nm_setting_wireless_security_add_pairwise (s_wsec, "none"); nm_setting_wireless_security_add_pairwise (s_wsec, "tkip"); nm_setting_wireless_security_add_group (s_wsec, "tkip"); - key_mgmt = "wpa-none"; + key_mgmt = "wpa-psk"; } else key_mgmt = "none"; } else key_mgmt = "none"; - if (g_strcmp0 (key_mgmt, "wpa-none") == 0) { + if (g_strcmp0 (key_mgmt, "wpa-psk") == 0) { + /* use WPA */ if (password) { if (!nm_utils_wpa_psk_valid (password)) { g_set_error (error, NMCLI_ERROR, 0, _("'%s' is not valid WPA PSK"), password); @@ -2813,6 +2812,7 @@ set_wireless_security_for_hotspot (NMSettingWirelessSecurity *s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL); } else { + /* use WEP */ if (password) { if (!nm_utils_wep_key_valid (password, NM_WEP_KEY_TYPE_KEY)) { g_set_error (error, NMCLI_ERROR, 0, |