fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 11:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: pass const strv plugins array to load_plugins()

Browse source
This commit is contained in:
Thomas Haller 2019-06-15 09:06:55 +02:00
parent a56fb02af6
commit 396b188697
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/settings/nm-settings.c
View file

@ -1360,9 +1360,9 @@ add_plugin_keyfile (NMSettings *self)
}
static gboolean
load_plugins (NMSettings *self, const char **plugins, GError **error)
load_plugins (NMSettings *self, const char *const*plugins, GError **error)
{
const char **iter;
const char *const*iter;
gboolean success = TRUE;
gboolean add_ibft = FALSE;
gboolean has_no_ibft;
@ -1411,12 +1411,11 @@ load_plugins (NMSettings *self, const char **plugins, GError **error)
if (!success)
break;
if (add_ibft && nm_streq (pname, "ifcfg-rh")) {
if ( add_ibft
&& nm_streq (pname, "ifcfg-rh")) {
/* The plugin ibft is not explicitly mentioned but we just enabled "ifcfg-rh".
* Enable "ibft" by default after "ifcfg-rh". */
pname = "ibft";
add_ibft = FALSE;
success = add_plugin_load_file (self, "ibft", error);
if (!success)
break;
@ -1849,7 +1848,7 @@ nm_settings_start (NMSettings *self, GError **error)
/* Load the plugins; fail if a plugin is not found. */
plugins = nm_config_data_get_plugins (nm_config_get_data_orig (priv->config), TRUE);
if (!load_plugins (self, (const char **) plugins, error))
if (!load_plugins (self, (const char *const*) plugins, error))
return FALSE;
load_connections (self);