From a5103bf234b876d6e20aabf8e6966c2968deee55 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 2 Feb 2011 17:25:56 -0600 Subject: [PATCH] libnm-util: silently ignore non-secrets when updating connection secrets --- libnm-util/nm-setting.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 94138d0ad5..f0809f0d1a 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -508,13 +508,9 @@ update_one_secret (NMSetting *setting, const char *key, GValue *value, GError ** return FALSE; } - if (!(prop_spec->flags & NM_SETTING_PARAM_SECRET)) { - g_set_error (error, - NM_SETTING_ERROR, - NM_SETTING_ERROR_PROPERTY_NOT_SECRET, - "%s", key); - return FALSE; - } + /* Silently ignore non-secrets */ + if (!(prop_spec->flags & NM_SETTING_PARAM_SECRET)) + return TRUE; if (g_value_type_compatible (G_VALUE_TYPE (value), G_PARAM_SPEC_VALUE_TYPE (prop_spec))) { g_object_set_property (G_OBJECT (setting), prop_spec->name, value);