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

2007-10-24 Dan Williams <dcbw@redhat.com>

Browse source 
* src/supplicant-manager/nm-supplicant-config.c
		- (nm_supplicant_config_add_blob): pass blob data and length for
			verification
		- (get_hash_cb): use GByteArrays rather than GArrays; easier to follow



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3020 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-24 19:27:48 +00:00
parent 9fec2307f0
commit 2eb8b115f3
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-10-24 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-config.c
- (nm_supplicant_config_add_blob): pass blob data and length for
verification
- (get_hash_cb): use GByteArrays rather than GArrays; easier to follow
2007-10-24 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-settings-verify.c

11
src/supplicant-manager/nm-supplicant-config.c
View file

@ -171,7 +171,7 @@ nm_supplicant_config_add_blob (NMSupplicantConfig *self,
priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self);
type = nm_supplicant_settings_verify_setting (key, NULL, 0);
type = nm_supplicant_settings_verify_setting (key, value->data, value->len);
if (type == TYPE_INVALID) {
nm_debug ("Key '%s' and/or it's contained value is invalid.", key);
return FALSE;
@ -261,7 +261,7 @@ get_hash_cb (gpointer key, gpointer value, gpointer user_data)
{
ConfigOption *opt = (ConfigOption *) value;
GValue *variant;
GArray *array;
GByteArray *array;
variant = g_slice_new0 (GValue);
@ -271,10 +271,11 @@ get_hash_cb (gpointer key, gpointer value, gpointer user_data)
g_value_set_int (variant, atoi (opt->value));
break;
case TYPE_BYTES:
array = g_array_new (TRUE, TRUE, sizeof (char));
g_array_append_vals (array, opt->value, opt->len);
g_value_init (variant, dbus_g_type_get_collection ("GArray", G_TYPE_CHAR));
array = g_byte_array_sized_new (opt->len);
g_byte_array_append (array, opt->value, opt->len);
g_value_init (variant, DBUS_TYPE_G_UCHAR_ARRAY);
g_value_set_boxed (variant, array);
g_byte_array_free (array, TRUE);
break;
case TYPE_KEYWORD:
g_value_init (variant, G_TYPE_STRING);