diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-09-11 11:03:28 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-09-11 11:13:03 +0200 |
| commit | 60c86828b7d3858e130084a27e260eb20551a473 (patch) | |
| tree | 97d918df94a697e939150e89023ae686759e79ce /src/nm-ip4-config.c | |
| parent | d39df457c7618ace1e1daefb8bb41d23676e1dcd (diff) | |
| parent | 857b32ce16c33d2fb191da77e9a3f3b542714d74 (diff) | |
Merge remote-tracking branch 'salsa/master'
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, |