diff options
author | Michael Biebl <biebl@debian.org> | 2015-08-28 01:13:48 +0200 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2015-08-28 01:13:48 +0200 |
commit | 81836c2d44802b4cca833d7775dd627e0797a7e2 (patch) | |
tree | 91154e6cefc0465306603f51ec0010d9963bbea4 /src/vpn-manager/nm-vpn-connection.c | |
parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) |
Imported Upstream version 1.0.6upstream/1.0.6upstream
Diffstat (limited to 'src/vpn-manager/nm-vpn-connection.c')
-rw-r--r-- | src/vpn-manager/nm-vpn-connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 795a81873..c34155efa 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -932,11 +932,11 @@ apply_parent_device_config (NMVpnConnection *connection) * vpn-config. Instead we tell NMDefaultRouteManager directly about the * default route. */ if (vpn4_parent_config) { - nm_ip4_config_merge (vpn4_parent_config, priv->ip4_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); } if (vpn6_parent_config) { - nm_ip6_config_merge (vpn6_parent_config, priv->ip6_config); + nm_ip6_config_merge (vpn6_parent_config, priv->ip6_config, NM_IP_CONFIG_MERGE_DEFAULT); nm_ip6_config_set_gateway (vpn6_parent_config, NULL); } } |