summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-07-07 16:54:05 +0200
committerThomas Haller <thaller@redhat.com>2015-07-07 16:55:31 +0200
commit08b99eea10500e9418d619c531de87864069c1e2 (patch)
treecfabb44c5f7da6ef4ddf39bfa9a2f305c9f9bd57
parentad2809cf6abef2781111debcf2dbecbf789b8442 (diff)
downloadNetworkManager-08b99eea10500e9418d619c531de87864069c1e2.tar.gz
settings: get_plugin() should return plugin that has all requested capabilities
This bug had no real consequences because we only called get_plugin() with one capability at a time.
-rw-r--r--src/settings/nm-settings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index befebc1591..7ed230e1b6 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -536,7 +536,7 @@ get_plugin (NMSettings *self, guint32 capability)
NMSystemConfigInterfaceCapabilities caps = NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE;
g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_CAPABILITIES, &caps, NULL);
- if (caps & capability)
+ if (NM_FLAGS_ALL (caps, capability))
return NM_SYSTEM_CONFIG_INTERFACE (iter->data);
}