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

core: fix adding objects to NMIPConfig with @append_force

Browse source 
If the @append_force argument is set and the object is already in the
list, it must be moved at the end.

Fixes: 22edeb5b69 ('core: track addresses for NMIP4Config/NMIP6Config via NMDedupMultiIndex')
(cherry picked from commit 8b121c7048)
(cherry picked from commit 52241748e8)
(cherry picked from commit d6c3d9c9dc)
This commit is contained in:
Beniamino Galvani 2019-08-27 18:27:24 +02:00
parent db1e24cc49
commit 11f355dc85
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nm-ip4-config.c
View file

@ -191,7 +191,9 @@ _nm_ip_config_add_obj (NMDedupMultiIndex *multi_idx,
if (!nm_dedup_multi_index_add_full (multi_idx,
&idx_type->parent,
obj_new,
NM_DEDUP_MULTI_IDX_MODE_APPEND,
append_force
? NM_DEDUP_MULTI_IDX_MODE_APPEND_FORCE
: NM_DEDUP_MULTI_IDX_MODE_APPEND,
NULL,
entry_old ?: NM_DEDUP_MULTI_ENTRY_MISSING,
NULL,

4
src/tests/test-ip4-config.c
View file

@ -113,9 +113,7 @@ test_replace (void)
g_assert (nm_ip4_config_replace (config2, config1, &relevant_changes));
g_assert (relevant_changes);
/* FIXME: this currently fails due to a bug in replace() */
g_assert (!nm_ip4_config_equal (config1, config2));
g_assert (nm_ip4_config_equal (config1, config2));
}
static void