colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils: override VPN plugin's never-default when ignoring auto routes (rh #804563)

Browse Source 
Setting never-default ito TRUE when VPN server provides routes was done
in https://bugzilla.gnome.org/show_bug.cgi?id=621698
This commit is contained in:
Jiří Klimeš
2012-03-20 17:17:49 +01:00
parent ce6b667a68
commit 5238aa4107
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/NetworkManagerUtils.c
View File

@@ -161,6 +161,7 @@ void
nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting) nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting)
{ {
int i, j; int i, j;
gboolean setting_never_default;
if (!setting) if (!setting)
return; /* Defaults are just fine */ return; /* Defaults are just fine */
@@ -250,8 +251,14 @@ nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting)
nm_ip4_config_add_route (ip4_config, setting_route); nm_ip4_config_add_route (ip4_config, setting_route);
} }
if (nm_setting_ip4_config_get_never_default (setting)) setting_never_default = nm_setting_ip4_config_get_never_default (setting);
nm_ip4_config_set_never_default (ip4_config, TRUE);
if (nm_setting_ip4_config_get_ignore_auto_routes (setting))
nm_ip4_config_set_never_default (ip4_config, setting_never_default);
else {
if (setting_never_default)
nm_ip4_config_set_never_default (ip4_config, TRUE);
}
} }
static inline gboolean static inline gboolean