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

ifupdown: ssid is now GBytes for quite some time

Browse source 
Fixes: c43f88907b
(cherry picked from commit b6bbf3df1e)
This commit is contained in:
Lubomir Rintel 2016-03-14 13:14:12 +01:00
parent 1fc6495552
commit 7d1b0fa835
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/settings/plugins/ifupdown/parser.c
View file

@ -114,13 +114,12 @@ update_wireless_setting_from_if_block(NMConnection *connection,
const gchar* newkey = map_by_mapping(mapping, curr->key+wireless_l);
nm_log_info (LOGD_SETTINGS, "wireless setting key: %s='%s'", newkey, curr->data);
if(newkey && !strcmp("ssid", newkey)) {
GByteArray *ssid;
GBytes *ssid;
gint len = strlen(curr->data);
ssid = g_byte_array_sized_new (len);
g_byte_array_append (ssid, (const guint8 *) curr->data, len);
ssid = g_bytes_new (curr->data, len);
g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL);
g_byte_array_free (ssid, TRUE);
g_bytes_unref (ssid);
nm_log_info (LOGD_SETTINGS, "setting wireless ssid = %d", len);
} else {
g_object_set(wireless_setting,
@ -132,13 +131,12 @@ update_wireless_setting_from_if_block(NMConnection *connection,
const gchar* newkey = map_by_mapping(mapping, curr->key+wpa_l);
if(newkey && !strcmp("ssid", newkey)) {
GByteArray *ssid;
GBytes *ssid;
gint len = strlen(curr->data);
ssid = g_byte_array_sized_new (len);
g_byte_array_append (ssid, (const guint8 *) curr->data, len);
ssid = g_bytes_new (curr->data, len);
g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL);
g_byte_array_free (ssid, TRUE);
g_bytes_unref (ssid);
nm_log_info (LOGD_SETTINGS, "setting wpa ssid = %d", len);
} else if(newkey) {