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

core: don't reset existing routes when merging IP setting

Browse source 
Don't reset existing routes if ipvx.ignore-auto-routes=yes: callers
should already avoid adding them when not needed.

Previously we would also reset the manual gateway route just added.

Fixes: 5c299454b4

https://bugzilla.gnome.org/show_bug.cgi?id=790423
(cherry picked from commit a0cd75b20c)
This commit is contained in:
Beniamino Galvani 2017-11-17 11:33:06 +01:00
parent c7accc92d5
commit ba630b828b
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nm-ip4-config.c
View file

@ -954,8 +954,6 @@ nm_ip4_config_merge_setting (NMIP4Config *self,
}
/* Routes */
if (nm_setting_ip_config_get_ignore_auto_routes (setting))
nm_ip4_config_reset_routes (self);
for (i = 0; i < nroutes; i++) {
NMIPRoute *s_route = nm_setting_ip_config_get_route (setting, i);
NMPlatformIP4Route route;

2
src/nm-ip6-config.c
View file

@ -629,8 +629,6 @@ nm_ip6_config_merge_setting (NMIP6Config *self,
}
/* Routes */
if (nm_setting_ip_config_get_ignore_auto_routes (setting))
nm_ip6_config_reset_routes (self);
for (i = 0; i < nroutes; i++) {
NMIPRoute *s_route = nm_setting_ip_config_get_route (setting, i);
NMPlatformIP6Route route;