From e5f8b426bf43e9b85a7a62e2f7db370f756cfdbc Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 11 Feb 2013 15:45:48 -0600 Subject: [PATCH] settings: load keyfile plugin even if no plugins are given If no config file was specified, and if no other plugins were given on the command-line, the keyfile plugin would not be loaded. This meant no connections would be read, and no connections could be created either. Always load the keyfile plugin. --- src/settings/nm-settings.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index fa474e09b..2cfda091f 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -587,7 +587,7 @@ load_plugins (NMSettings *self, const char **plugins, GError **error) gboolean keyfile_added = FALSE; gboolean success = TRUE; - for (iter = plugins; *iter; iter++) { + for (iter = plugins; iter && *iter; iter++) { GModule *plugin; char *full_name, *path; const char *pname = *iter; @@ -1768,12 +1768,10 @@ nm_settings_new (const char *config_file, priv->dbus_mgr = nm_dbus_manager_get (); priv->bus = nm_dbus_manager_get_connection (priv->dbus_mgr); - if (plugins) { - /* Load the plugins; fail if a plugin is not found. */ - if (!load_plugins (self, plugins, error)) { - g_object_unref (self); - return NULL; - } + /* Load the plugins; fail if a plugin is not found. */ + if (!load_plugins (self, plugins, error)) { + g_object_unref (self); + return NULL; } unmanaged_specs_changed (NULL, self);