From 9fbd4c17fa651df15ed2014cf0c15a7493384e30 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 19 May 2015 11:59:09 +0200 Subject: [PATCH] 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. (cherry picked from commit ae0608eef51cad2a583e98a17e478fbb497252f5) --- src/nm-config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nm-config.c b/src/nm-config.c index d3a3dd8802..79f4123e04 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -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; }