summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2010-10-29 23:19:41 -0500
committerDan Williams <dcbw@redhat.com>2010-10-29 23:19:41 -0500
commit8f699a77f2e4d825aa73c9c794637cf504a3e9b2 (patch)
tree1f7da7f85b3782720a6f151a28c3e8a1da46ffc3
parentb93cad014949ab6baa60416e9365d941e2a15fc3 (diff)
downloadNetworkManager-8f699a77f2e4d825aa73c9c794637cf504a3e9b2.tar.gz
libnm-util: check all valid permissions property types
-rw-r--r--libnm-util/nm-connection.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index ffcda5ded9..105dcbe144 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -471,7 +471,8 @@ validate_permissions_type (GHashTable *hash, GError **error)
if (s_con) {
permissions = g_hash_table_lookup (s_con, NM_SETTING_CONNECTION_PERMISSIONS);
if (permissions) {
- if (!G_VALUE_HOLDS (permissions, DBUS_TYPE_G_LIST_OF_STRING)) {
+ if ( !G_VALUE_HOLDS (permissions, G_TYPE_STRV)
+ && !G_VALUE_HOLDS (permissions, DBUS_TYPE_G_LIST_OF_STRING)) {
g_set_error_literal (error,
NM_SETTING_ERROR,
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH,