diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2022-06-24 13:33:12 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2022-06-24 13:36:49 +0200 |
| commit | 186ebc34d6716dd39223f60637af9086f8a2515d (patch) | |
| tree | fd89915eca8ae0643c31fec6ce87ca93224638f0 /src/core/nm-l3-config-data.c | |
| parent | d346ccd01845b94cdcedaec2c1992528ee6e7236 (diff) | |
| parent | b020a0dc29267ec099f631e93f214a0d3549ba40 (diff) | |
Merge remote-tracking branch 'debian/debian/master' into ubuntu/master
Diffstat (limited to 'src/core/nm-l3-config-data.c')
| -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 5ab2f6b8..2a722756 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]); } |