diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-01-09 08:41:33 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-01-10 13:43:51 +0100 |
| commit | 157644f20063d940eed9775cceb2b82302be92d7 (patch) | |
| tree | 390303ba75d2289f356bd5df973d7a83a9bdfd68 | |
| parent | b44a9ef7f705949544ff20189406aa1856c5434e (diff) | |
| download | NetworkManager-157644f20063d940eed9775cceb2b82302be92d7.tar.gz | |
libnm: fix nm_setting_diff() for ignore-reapply-immediately comparison
This bug had no effect, because NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY
has only one user, and it's used there in combination with
nm_setting_compare(). No caller passed this flag to nm_setting_diff().
Fixes: c9b3617c35b3380428a1800e8aa6692ee68b4b74
| -rw-r--r-- | libnm-core/nm-setting.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index aec01a1750..a972a1f6de 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -1379,7 +1379,7 @@ should_compare_prop (NMSetting *setting, if ((comp_flags & NM_SETTING_COMPARE_FLAG_INFERRABLE) && !(prop_flags & NM_SETTING_PARAM_INFERRABLE)) return FALSE; - if ((comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY) && !(prop_flags & NM_SETTING_PARAM_REAPPLY_IMMEDIATELY)) + if ((comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY) && (prop_flags & NM_SETTING_PARAM_REAPPLY_IMMEDIATELY)) return FALSE; if (prop_flags & NM_SETTING_PARAM_SECRET) { |