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

ifcfg-rh: correct the error handling for NM_CONTROLLED=no connections

Browse source 
We ought to set an error if we're returning NULL from
connection_from_file_full(). Also, printing out a warning ourselves makes no
sense -- the caller communicates this if we signal an error by returning NULL.

(cherry picked from commit e27aa5b4d7)
This commit is contained in:
Lubomir Rintel 2015-07-02 14:46:58 +02:00
parent 13cd646b9d
commit 9dc446cd3f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4675,7 +4675,8 @@ connection_from_file_full (const char *filename,
connection = create_unhandled_connection (filename, parsed, "unmanaged", out_unhandled);
if (!connection)
PARSE_WARNING ("NM_CONTROLLED was false but device was not uniquely identified; device will be managed");
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"NM_CONTROLLED was false but device was not uniquely identified; device will be managed");
goto done;
}