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

keyfile: add support for uint32 variant types when using gendata

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1614700
This commit is contained in:
Antonio Cardace 2020-05-07 17:09:49 +02:00
parent cf25497569
commit 858fb211ad
No known key found for this signature in database
GPG key ID: 6BF80ABD43E377D3
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
shared/nm-keyfile/nm-keyfile.c
View file

@ -3243,6 +3243,22 @@ _read_setting (KeyfileReaderInfo *info)
continue;
}
variant = g_variant_new_boolean (v);
} else if (g_variant_type_equal (variant_type, G_VARIANT_TYPE_UINT32)) {
guint64 v;
v = g_key_file_get_uint64 (info->keyfile,
info->group,
key,
&local);
if (local) {
if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
_("key '%s.%s' is not a uint32"),
info->group, key))
break;
continue;
}
variant = g_variant_new_uint32 ((guint32) v);
} else {
nm_assert_not_reached ();
continue;
@ -3851,6 +3867,11 @@ nm_keyfile_write (NMConnection *connection,
setting_name,
key,
g_variant_get_boolean (v));
} else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32)) {
g_key_file_set_uint64 (info.keyfile,
setting_name,
key,
(guint64) g_variant_get_uint32 (v));
} else {
/* BUG: The variant type is not implemented. Since the connection
* verifies, this can only mean we either wrongly didn't reject