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

config: minor fix in read_entire_config()

Browse source 
Calling read_entire_config() without passing a @cli argument would
always have caused an assert due to unset @o_config_main_file.
That is not a real problem as that situation didn't arise. Still
fix it.

(cherry picked from commit ae0608eef5)
This commit is contained in:
Thomas Haller 2015-05-19 11:59:09 +02:00
parent 79c80f00cc
commit 9fbd4c17fa
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nm-config.c
View file

@ -636,8 +636,7 @@ read_entire_config (const NMConfigCmdLineOptions *cli,
g_return_val_if_fail (!error || !*error, FALSE);
/* First read the base config file */
if ( cli
&& !read_base_config (keyfile, cli->config_main_file, &o_config_main_file, error)) {
if (!read_base_config (keyfile, cli ? cli->config_main_file : NULL, &o_config_main_file, error)) {
g_key_file_free (keyfile);
return NULL;
}