diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-02 19:19:18 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-08 12:32:34 +0200 |
| commit | da2ae8ce4e6cb03931454d7d6fa94866b03f6be2 (patch) | |
| tree | b083a05d673841c3e8cf4aee05e38872c10b331b | |
| parent | ff434af2c5eceb7ebc2aaffb154ceb39f7b857bb (diff) | |
| download | NetworkManager-da2ae8ce4e6cb03931454d7d6fa94866b03f6be2.tar.gz | |
vpn-connection: fix unsetting the gateway
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: 063677101ab7d43a9aa94c70eb1ca3a201269043
Fixes: 1465c1d3260712fbe2fd0c78c7a1fcf0fb8ce753
| -rw-r--r-- | src/vpn-manager/nm-vpn-connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 3b3715f525..4f84e18531 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -921,7 +921,7 @@ apply_parent_device_config (NMVpnConnection *connection) if (priv->ip4_config) { vpn4_parent_config = nm_ip4_config_new (ifindex); 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 (priv->ip6_config) { vpn6_parent_config = nm_ip6_config_new (ifindex); |