From ca5028e608fe4fe1185583c044a14c20354cab76 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 31 May 2016 09:19:40 +0200 Subject: [PATCH] config: fix ignoring internal [.config] section The [.config] section is configuration about the configuration file itself, it should not be merged. Properly ignore the [.config] section before merging the configuration file. --- src/nm-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nm-config.c b/src/nm-config.c index 73c5d73ea..1743a2024 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -682,7 +682,7 @@ read_config (GKeyFile *keyfile, gboolean is_base_config, const char *dirname, co /* the config-group is internal to every configuration snippets. It doesn't make sense * to merge the into the global configuration, and it doesn't make sense to preserve the * group beyond this point. */ - g_key_file_remove_group (keyfile, NM_CONFIG_KEYFILE_GROUP_CONFIG, NULL); + g_key_file_remove_group (kf, NM_CONFIG_KEYFILE_GROUP_CONFIG, NULL); /* Override the current settings with the new ones */ groups = g_key_file_get_groups (kf, &ngroups);