diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-05-19 11:59:09 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-05-19 11:59:09 +0200 |
| commit | ae0608eef51cad2a583e98a17e478fbb497252f5 (patch) | |
| tree | 61c01220be7f615f27476fc23df972ae663b8575 | |
| parent | 8e46a737db8879b1996928d39aca10a834225e5c (diff) | |
| download | NetworkManager-ae0608eef51cad2a583e98a17e478fbb497252f5.tar.gz | |
config: minor fix in read_entire_config()
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.
| -rw-r--r-- | src/nm-config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-config.c b/src/nm-config.c index ff81302f91..62b32b34d9 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -619,8 +619,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; } |