fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 19:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

l3cfg: fix comparing "has-dns-priority" flag in nm_l3_config_data_cmp_full()

Browse source 
Fixes: cb29244552 ('core: support compare flags in nm_l3_config_data_cmp_full()')
This commit is contained in:
Thomas Haller 2022-06-09 08:51:19 +02:00
parent b93750d4c5
commit 8e86cfb8ab
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/nm-l3-config-data.c
View file

@ -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]);
}