From 157644f20063d940eed9775cceb2b82302be92d7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 9 Jan 2019 08:41:33 +0100 Subject: [PATCH] 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 --- libnm-core/nm-setting.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) {