diff options
| author | Michael Biebl <biebl@debian.org> | 2019-09-06 09:26:09 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-09-06 09:26:09 +0200 |
| commit | 473dd863356491d7b984baef9c72e886c774a451 (patch) | |
| tree | f7863ed06a67003b8a362e1146a1dff22ea16c55 /src/nm-ip4-config.c | |
| parent | df49315721969c1013256ce92c6a0f825450f814 (diff) | |
| parent | 555dfa331e295a3a687a7cc6870e1349ffed8f26 (diff) | |
Update upstream source from tag 'upstream/1.20.2'
Update to upstream version '1.20.2' with Debian dir 0356038b3aea3f0577988e0b1019b86c657592cd
Diffstat (limited to 'src/nm-ip4-config.c')
| -rw-r--r-- | src/nm-ip4-config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 36e75bb2..6dd08434 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, |