diff options
| author | Michael Biebl <biebl@debian.org> | 2022-08-13 16:40:06 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-08-13 16:40:06 +0200 |
| commit | 38ca7ae9c3556e9a5b50ee15015ea194e6ca8da1 (patch) | |
| tree | 99f19f118f550362c3288e7b82a7aab3a75c8d64 /src/core/nm-l3-config-data.c | |
| parent | c2473cb3f165975f2899ccef11f036c9762a8aa3 (diff) | |
| parent | 49ac65f875a36d7ebcbc8270cf0fc60acbb2e052 (diff) | |
Merge tag 'debian/1.38.4-1' into debian/bullseye-backports
network-manager Debian release 1.38.4-1
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]); } |