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

device: fix regression for ignored search domains in ip._config_merge_and_apply()

Browse source 
Reported-by: Fabrice Bellet <fabrice@bellet.info>
Fixes: 2a5eea7e76

https://bugzilla.gnome.org/show_bug.cgi?id=752193
(cherry picked from commit d6831efc6b)
This commit is contained in:
Thomas Haller 2015-07-09 23:13:10 +02:00
parent 6f6a8a85c9
commit 0eef608cd1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/devices/nm-device.c
View file

@ -3241,12 +3241,13 @@ ip4_config_merge_and_apply (NMDevice *self,
if (s_ip4) { if (s_ip4) {
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip4)) if (nm_setting_ip_config_get_ignore_auto_routes (s_ip4))
nm_ip4_config_reset_routes (composite); nm_ip4_config_reset_routes (composite);
if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4)) if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4)) {
nm_ip4_config_reset_nameservers (composite); nm_ip4_config_reset_nameservers (composite);
nm_ip4_config_reset_domains (composite); nm_ip4_config_reset_domains (composite);
nm_ip4_config_reset_searches (composite); nm_ip4_config_reset_searches (composite);
} }
} }
}
/* Merge user overrides into the composite config. For assumed connections, /* Merge user overrides into the composite config. For assumed connections,
* con_ip4_config is empty. */ * con_ip4_config is empty. */
@ -3852,12 +3853,13 @@ ip6_config_merge_and_apply (NMDevice *self,
if (s_ip6) { if (s_ip6) {
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip6)) if (nm_setting_ip_config_get_ignore_auto_routes (s_ip6))
nm_ip6_config_reset_routes (composite); nm_ip6_config_reset_routes (composite);
if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6)) if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6)) {
nm_ip6_config_reset_nameservers (composite); nm_ip6_config_reset_nameservers (composite);
nm_ip6_config_reset_domains (composite); nm_ip6_config_reset_domains (composite);
nm_ip6_config_reset_searches (composite); nm_ip6_config_reset_searches (composite);
} }
} }
}
/* Merge user overrides into the composite config. For assumed connections, /* Merge user overrides into the composite config. For assumed connections,
* con_ip6_config is empty. */ * con_ip6_config is empty. */