diff options
| author | Michael Biebl <biebl@debian.org> | 2022-06-17 22:04:36 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-06-17 22:04:36 +0200 |
| commit | 24b6b46aab0a00e1ef111aaff05f068ec8ad3d5b (patch) | |
| tree | 473dc5914401fdf1094777b5f557da0fb0bd133c /src/core/nm-l3-config-data.c | |
| parent | b3b81846241e51b3e2bfb34c1b5af385cdcdf894 (diff) | |
| parent | f7c750061dab327e638c0129cfafd5b2215b3a2e (diff) | |
Update upstream source from tag 'upstream/1.38.2'
Update to upstream version '1.38.2' with Debian dir c1f50e9f3555d9d539c7417659080741eabd1208
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]); } |