summaryrefslogtreecommitdiff
path: root/libnm-core/nm-keyfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'libnm-core/nm-keyfile.c')
-rw-r--r--libnm-core/nm-keyfile.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index 6a4681a3ae..9ac3eb4e18 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -1619,16 +1619,16 @@ team_config_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
gs_free_error GError *error = NULL;
conf = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
+
+ g_object_set (G_OBJECT (setting), key, conf, NULL);
+
if ( conf
- && conf[0]
- && !nm_utils_is_json_object (conf, &error)) {
+ && !nm_setting_verify (setting, NULL, &error)) {
handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
_("ignoring invalid team configuration: %s"),
error->message);
- g_clear_pointer (&conf, g_free);
+ g_object_set (G_OBJECT (setting), key, NULL, NULL);
}
-
- g_object_set (G_OBJECT (setting), key, conf, NULL);
}
static void