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

device: only reset ipx fields when there L3 configuration is present

Browse source 
Fixes: 79630c11e5
(cherry picked from commit 4843e625a8)
This commit is contained in:
Lubomir Rintel 2015-06-28 19:24:29 +02:00
parent 1ee9ff2cd6
commit d5677dcd2b
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3227,12 +3227,14 @@ ip4_config_merge_and_apply (NMDevice *self,
if (connection) {
NMSettingIPConfig *s_ip4 = nm_connection_get_setting_ip4_config (connection);
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip4))
nm_ip4_config_reset_routes (composite);
if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4))
nm_ip4_config_reset_nameservers (composite);
nm_ip4_config_reset_domains (composite);
nm_ip4_config_reset_searches (composite);
if (s_ip4) {
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip4))
nm_ip4_config_reset_routes (composite);
if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4))
nm_ip4_config_reset_nameservers (composite);
nm_ip4_config_reset_domains (composite);
nm_ip4_config_reset_searches (composite);
}
}
/* Merge user overrides into the composite config. For assumed connections,
@ -3835,12 +3837,14 @@ ip6_config_merge_and_apply (NMDevice *self,
if (connection) {
NMSettingIPConfig *s_ip6 = nm_connection_get_setting_ip6_config (connection);
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip6))
nm_ip6_config_reset_routes (composite);
if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6))
nm_ip6_config_reset_nameservers (composite);
nm_ip6_config_reset_domains (composite);
nm_ip6_config_reset_searches (composite);
if (s_ip6) {
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip6))
nm_ip6_config_reset_routes (composite);
if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6))
nm_ip6_config_reset_nameservers (composite);
nm_ip6_config_reset_domains (composite);
nm_ip6_config_reset_searches (composite);
}
}
/* Merge user overrides into the composite config. For assumed connections,