From 11f355dc85e736a302a0cef8291c81ab77667e51 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 27 Aug 2019 18:27:24 +0200 Subject: [PATCH] core: fix adding objects to NMIPConfig with @append_force If the @append_force argument is set and the object is already in the list, it must be moved at the end. Fixes: 22edeb5b691b ('core: track addresses for NMIP4Config/NMIP6Config via NMDedupMultiIndex') (cherry picked from commit 8b121c70488bd45461847a2f1cc501ad7aa087a4) (cherry picked from commit 52241748e88fdc3b46ccdb467423ff18ef20b07f) (cherry picked from commit d6c3d9c9dcafb2358aadfcf1c6065ec704d1dd55) --- src/nm-ip4-config.c | 4 +++- src/tests/test-ip4-config.c | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 1c06a42ce9..03467be93d 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -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, diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index 35fa9e9322..a4fbd11bc0 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -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