summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-01-28 08:41:36 +0100
committerLubomir Rintel <lkundrak@v3.sk>2016-01-28 11:50:15 +0100
commit061edeaea67387c6b91d1bd5345e322315b4726f (patch)
treebcfc2f98cb5b6192272181452c2e9407cc62ed8c
parent8e3a5f6d3a6544fa2a83808aca69305836f19858 (diff)
downloadNetworkManager-061edeaea67387c6b91d1bd5345e322315b4726f.tar.gz
vpn-service-plugin: allow VPNs with no IP configuration
Perfectly fine for ethernet-bridged networks (openvpn with tap devices).
-rw-r--r--libnm-glib/nm-vpn-plugin.c2
-rw-r--r--libnm/nm-vpn-service-plugin.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index d180ec447f..29d88d1c6c 100644
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -342,8 +342,6 @@ nm_vpn_plugin_set_config (NMVPNPlugin *plugin,
if (val && g_value_get_boolean (val))
priv->has_ip6 = TRUE;
- g_warn_if_fail (priv->has_ip4 || priv->has_ip6);
-
/* Record the items that need to also be inserted into the
* ip4config, for compatibility with older daemons.
*/
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index ae5af3239f..0de3805174 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -315,8 +315,6 @@ nm_vpn_service_plugin_set_config (NMVpnServicePlugin *plugin,
(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_HAS_IP4, "b", &priv->has_ip4);
(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_HAS_IP6, "b", &priv->has_ip6);
- g_warn_if_fail (priv->has_ip4 || priv->has_ip6);
-
/* Record the items that need to also be inserted into the
* ip4config, for compatibility with older daemons.
*/