diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-06-09 08:51:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-06-09 08:53:34 +0200 |
| commit | 8e86cfb8ab09e3355298bef210d3e4a3e69977db (patch) | |
| tree | e76e5e14ad55516267c93d7756c0a498d4b6f103 | |
| parent | b93750d4c5b662aede036c1ab4763b1dff21970b (diff) | |
| download | NetworkManager-8e86cfb8ab09e3355298bef210d3e4a3e69977db.tar.gz | |
l3cfg: fix comparing "has-dns-priority" flag in nm_l3_config_data_cmp_full()
Fixes: cb29244552af ('core: support compare flags in nm_l3_config_data_cmp_full()')
| -rw-r--r-- | src/core/nm-l3-config-data.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index ff0078bd7c..87cb87bf2b 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -2275,6 +2275,8 @@ nm_l3_config_data_cmp_full(const NML3ConfigData *a, } if (NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_DNS)) { + const NML3ConfigDatFlags FLAG = NM_L3_CONFIG_DAT_FLAGS_HAS_DNS_PRIORITY(IS_IPv4); + NM_CMP_RETURN(_garray_inaddr_cmp(a->nameservers_x[IS_IPv4], b->nameservers_x[IS_IPv4], addr_family)); @@ -2283,7 +2285,8 @@ nm_l3_config_data_cmp_full(const NML3ConfigData *a, NM_CMP_RETURN( nm_strv_ptrarray_cmp(a->dns_options_x[IS_IPv4], b->dns_options_x[IS_IPv4])); - if (NM_FLAGS_ANY(a->flags, NM_L3_CONFIG_DAT_FLAGS_HAS_DNS_PRIORITY(IS_IPv4))) + NM_CMP_DIRECT(NM_FLAGS_ANY(a->flags, FLAG), NM_FLAGS_ANY(b->flags, FLAG)); + if (NM_FLAGS_ANY(a->flags, FLAG)) NM_CMP_DIRECT(a->dns_priority_x[IS_IPv4], b->dns_priority_x[IS_IPv4]); } |