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

vpn-connection: fix unsetting the gateway

Browse source 
Addresses the clash between the two commits which would cause the parent device
gateway to be overwritten with 0.0.0.0 upon route-based VPN activation:

Fixes: 063677101a
Fixes: 1465c1d326
(cherry picked from commit da2ae8ce4e)
This commit is contained in:
Lubomir Rintel 2015-09-02 19:19:18 +02:00
parent f768f09a86
commit 15e4ee69df
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vpn-manager/nm-vpn-connection.c
View file

@ -933,7 +933,7 @@ apply_parent_device_config (NMVpnConnection *connection)
* default route. */
if (vpn4_parent_config) {
nm_ip4_config_merge (vpn4_parent_config, priv->ip4_config, NM_IP_CONFIG_MERGE_DEFAULT);
nm_ip4_config_set_gateway (vpn4_parent_config, 0);
nm_ip4_config_unset_gateway (vpn4_parent_config);
}
if (vpn6_parent_config) {
nm_ip6_config_merge (vpn6_parent_config, priv->ip6_config, NM_IP_CONFIG_MERGE_DEFAULT);