fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 09:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-core: preserve keys order in team.config with old jansson libs

Browse source 
When jansson lib version is < 2.8 the order of the keys of json objects
is not preserved automatically. In particular, when loading the json
string, parsing it and dumping it back to a string the key order will be
lost if the now deprecated JSON_PRESERVE_ORDER flag is not set.
Add the flag: will do nothing on recent jansson versions but will fix
behavior for legacy ones.
This commit is contained in:
Francesco Giudici 2017-11-15 15:47:29 +01:00
parent a9b5079324
commit 5e6f7de4be
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm-core/nm-utils.c
View file

@ -4696,7 +4696,7 @@ _nm_utils_team_config_set (char **conf,
done:
if (updated) {
g_free (*conf);
*conf = json_dumps (json, 0);
*conf = json_dumps (json, JSON_PRESERVE_ORDER);
/* Don't save an empty config */
if (nm_streq0 (*conf, "{}")) {
g_free (*conf);