diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-06-10 17:27:15 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-06-16 15:38:47 +0200 |
| commit | eeb31f438224420c20e96bbe2164410d3501fef4 (patch) | |
| tree | 27587ac2d1f8bea50762ff135ae96bc209f1f976 | |
| parent | 75d7b7622692380f243a459ce0f1eb21c8e98373 (diff) | |
| download | NetworkManager-eeb31f438224420c20e96bbe2164410d3501fef4.tar.gz | |
config: ensure nm_config_get_plugins() to return stripped values
| -rw-r--r-- | src/nm-config.c | 3 | ||||
| -rw-r--r-- | src/settings/nm-settings.c | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/nm-config.c b/src/nm-config.c index d045f6516d..41d46569ae 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -1383,7 +1383,8 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) else priv->no_auto_default_file = g_strdup (DEFAULT_NO_AUTO_DEFAULT_FILE); - priv->plugins = g_key_file_get_string_list (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "plugins", NULL, NULL); + priv->plugins = _nm_utils_strv_cleanup (g_key_file_get_string_list (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "plugins", NULL, NULL), + TRUE, TRUE, TRUE); if (!priv->plugins) priv->plugins = g_new0 (char *, 1); diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index a0ba2f5613..5c32d71042 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -758,21 +758,10 @@ load_plugins (NMSettings *self, const char **plugins, GError **error) const char **iter; gboolean keyfile_added = FALSE; gboolean success = TRUE; - gs_strfreev char **plugins_stripped = NULL; gboolean add_ibft = FALSE; gboolean has_no_ibft; gssize idx_no_ibft, idx_ibft; - if (plugins) { - char **miter; - - /* preprocess plugin list and strip whitespaces. */ - plugins_stripped = g_strdupv ((char **) plugins); - for (miter = plugins_stripped; *miter; miter++) - g_strstrip (*miter); - plugins = (const char **) plugins_stripped; - } - idx_ibft = _nm_utils_strv_find_first ((char **) plugins, -1, "ibft"); idx_no_ibft = _nm_utils_strv_find_first ((char **) plugins, -1, "no-ibft"); has_no_ibft = idx_no_ibft >= 0 && idx_no_ibft > idx_ibft; |