diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 36e75bb2d2..6dd08434af 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -190,7 +190,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 0d9c055b5f..5afd8670d4 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -112,9 +112,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