fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 20:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: PSK isn't necessary for valid WPA connection

Browse source 
We'll ask secret agents for it if it's not stored in the connection.
This commit is contained in:
Dan Williams 2010-12-14 15:26:40 -06:00
parent ca1338007c
commit 16a8a951e9
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
system-settings/plugins/ifcfg-rh/reader.c
View file

@ -1895,11 +1895,8 @@ parse_wpa_psk (shvarFile *ifcfg,
if (!psk)
psk = svGetValue (ifcfg, "WPA_PSK", TRUE);
if (!psk) {
g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
"Missing WPA_PSK for WPA-PSK key management");
if (!psk)
return NULL;
}
p = psk;
@ -2516,10 +2513,10 @@ make_wpa_setting (shvarFile *ifcfg,
if (!strcmp (value, "WPA-PSK")) {
psk = parse_wpa_psk (ifcfg, file, ssid, error);
if (!psk)
goto error;
g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_PSK, psk, NULL);
g_free (psk);
if (psk) {
g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_PSK, psk, NULL);
g_free (psk);
}
if (adhoc)
g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-none", NULL);