diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-04-24 15:42:49 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-05-15 12:59:55 +0200 |
| commit | 63836f394510ab173aefd24aca3f1e29a5baf046 (patch) | |
| tree | 0ce5c0530fed2a7c0b5d47bd7088e02dac1b464f | |
| parent | fb2ef01d85b4a12295f162b5e116855dbc5c3d8d (diff) | |
| download | NetworkManager-63836f394510ab173aefd24aca3f1e29a5baf046.tar.gz | |
ifcfg-rh: don't skip 802-11-security if there's no WPA-PSK
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 5baa9c792b..5dc42e28bb 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -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) |