From 81836c2d44802b4cca833d7775dd627e0797a7e2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Aug 2015 01:13:48 +0200 Subject: Imported Upstream version 1.0.6 --- src/vpn-manager/nm-vpn-connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/vpn-manager') diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 795a8187..c34155ef 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); } } -- cgit 1.3.0-6-gf8a5