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

keyfile: write also empty byte arrays to keyfiles

Browse source 
It's not the job of keyfile writer to enforce certain settings. A
%NULL GBytes property is shall be treated distinct from a byte array
with zero length.

The NMSetting may or may not reject such settings as invalid during
verify() or mangle them during normalize(). But reader/writer should
just serialize every property as-is.
This commit is contained in:
Thomas Haller 2017-01-05 12:07:33 +01:00
parent 932da77b5b
commit e844df1099
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libnm-core/nm-keyfile-writer.c
View file

@ -300,9 +300,8 @@ ssid_writer (KeyfileWriterInfo *info,
gsize ssid_len;
const char *setting_name = nm_setting_get_name (setting);
gboolean new_format = TRUE;
unsigned int semicolons = 0;
gsize semicolons = 0;
gsize i;
char *ssid;
g_return_if_fail (G_VALUE_HOLDS (value, G_TYPE_BYTES));
@ -310,14 +309,17 @@ ssid_writer (KeyfileWriterInfo *info,
if (!bytes)
return;
ssid_data = g_bytes_get_data (bytes, &ssid_len);
if (ssid_len == 0)
if (!ssid_data || !ssid_len) {
nm_keyfile_plugin_kf_set_string (info->keyfile, setting_name, key, "");
return;
}
/* Check whether each byte is printable. If not, we have to use an
* integer list, otherwise we can just use a string.
*/
for (i = 0; i < ssid_len; i++) {
char c = ssid_data[i] & 0xFF;
const char c = ssid_data[i];
if (!g_ascii_isprint (c)) {
new_format = FALSE;
break;
@ -327,22 +329,24 @@ ssid_writer (KeyfileWriterInfo *info,
}
if (new_format) {
ssid = g_malloc0 (ssid_len + semicolons + 1);
gs_free char *ssid = NULL;
if (semicolons == 0)
memcpy (ssid, ssid_data, ssid_len);
ssid = g_strndup ((char *) ssid_data, ssid_len);
else {
/* Escape semicolons with backslashes to make strings
* containing ';', such as '16;17;' unambiguous */
gsize j = 0;
ssid = g_malloc (ssid_len + semicolons + 1);
for (i = 0; i < ssid_len; i++) {
if (ssid_data[i] == ';')
ssid[j++] = '\\';
ssid[j++] = ssid_data[i];
}
ssid[j] = '\0';
}
nm_keyfile_plugin_kf_set_string (info->keyfile, setting_name, key, ssid);
g_free (ssid);
} else
nm_keyfile_plugin_kf_set_integer_list_uint8 (info->keyfile, setting_name, key, ssid_data, ssid_len);
}
@ -364,8 +368,8 @@ password_raw_writer (KeyfileWriterInfo *info,
if (!array)
return;
data = g_bytes_get_data (array, &len);
if (!data || !len)
return;
if (!data)
len = 0;
nm_keyfile_plugin_kf_set_integer_list_uint8 (info->keyfile, setting_name, key, data, len);
}