fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 08:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: merge branch 'bg/dns-sort'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1427

(cherry picked from commit e03b8fa447)
This commit is contained in:
Beniamino Galvani 2022-10-14 10:34:32 +02:00
commit 925ea8b24c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/dns/nm-dns-manager.c
View file

@ -2039,8 +2039,15 @@ nm_dns_manager_set_ip_config(NMDnsManager *self,
if (!ip_data) { if (!ip_data) {
ip_data = _dns_config_ip_data_new(data, addr_family, source_tag, l3cd, ip_config_type); ip_data = _dns_config_ip_data_new(data, addr_family, source_tag, l3cd, ip_config_type);
if (!any_removed) priv->ip_data_lst_need_sort = TRUE;
if (!any_removed) {
/* `any_removed` tracks whether we deleted any ip_data. If that happened,
* we already compared the old and new l3cds and set `changed` accordingly.
* Here we only need to set `changed` if we are adding a new ip_data without
* removing the old one.
*/
changed = TRUE; changed = TRUE;
}
} else { } else {
ip_data->ip_config_type = ip_config_type; ip_data->ip_config_type = ip_config_type;
changed = TRUE; changed = TRUE;