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

ifcfg-rh: don't skip 802-11-security if there's no WPA-PSK

Browse source
This commit is contained in:
Lubomir Rintel 2017-04-24 15:42:49 +02:00
parent fb2ef01d85
commit 63836f3945
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -3328,6 +3328,7 @@ make_wpa_setting (shvarFile *ifcfg,
char *value, *psk, *lower;
gboolean wpa_psk = FALSE, wpa_eap = FALSE, ieee8021x = FALSE;
int i_val;
GError *local = NULL;
wsec = NM_SETTING_WIRELESS_SECURITY (nm_setting_wireless_security_new ());
@ -3371,12 +3372,14 @@ make_wpa_setting (shvarFile *ifcfg,
/* Read PSK if it's system-owned */
if (psk_flags == NM_SETTING_SECRET_FLAG_NONE) {
psk = parse_wpa_psk (ifcfg, file, ssid, error);
psk = parse_wpa_psk (ifcfg, file, ssid, &local);
if (psk) {
g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_PSK, psk, NULL);
g_free (psk);
} else if (error)
} else if (local) {
g_propagate_error (error, local);
goto error;
}
}
if (adhoc)