fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 00:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg: set error for failure reading unrecognized connection in connection_from_file_full()

Browse source
This commit is contained in:
Thomas Haller 2017-02-21 11:48:55 +01:00
parent 9b8e56180f
commit d37c77234f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5128,7 +5128,6 @@ connection_from_file_full (const char *filename,
"File '%s' had neither TYPE nor DEVICE keys.", filename);
return NULL;
}
g_assert (device[0]);
if (!strcmp (device, "lo")) {
if (out_ignore_error)
@ -5232,8 +5231,11 @@ connection_from_file_full (const char *filename,
connection = bridge_connection_from_ifcfg (filename, parsed, error);
else {
connection = create_unhandled_connection (filename, parsed, "unrecognized", out_unhandled);
if (!connection)
if (!connection) {
PARSE_WARNING ("connection type was unrecognized but device was not uniquely identified; device may be managed");
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Failed to read unrecognized connection");
}
return g_steal_pointer (&connection);
}