From 3abc2364273b1cefe9bfc55668437492d468f142 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Thu, 2 Feb 2006 15:07:35 +0000 Subject: [PATCH] 2006-02-02 Robert Love Patch by Sureshkumar T : * src/vpn-manager/nm-vpn-connection.c, src/NetworkManagerSystem.c: Check for and handle empty string for iface. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1426 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 ++++++++-- src/NetworkManagerSystem.c | 2 +- src/vpn-manager/nm-vpn-connection.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9289075518..237f2fdc57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-02 Robert Love + + Patch by Sureshkumar T : + * src/vpn-manager/nm-vpn-connection.c, src/NetworkManagerSystem.c: + Check for and handle empty string for iface. + 2006-02-01 Robert Love * configure.in, man/nm-tool.1.in, man/Makefile.am: Add nm-tool(1) @@ -114,8 +120,8 @@ Novell #138404. * gnome/applet/wireless-security-manager.c, gnome/applet/wireless-security-manager.h: If wsm_set_capabilities() - does not add any security options, not even none, print a warning - and return FALSE. This let's functions constructed a dialog bail + does not add any security options, not even NONE, print a warning + and return FALSE. This let's functions constructing a dialog bail out if the device's capabilities and the network's requirements have zero overlap. diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c index b6e2861ec4..fc93a9d22f 100644 --- a/src/NetworkManagerSystem.c +++ b/src/NetworkManagerSystem.c @@ -273,7 +273,7 @@ gboolean nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, NMDevi if (active_device && (ad_config = nm_device_get_ip4_config (active_device))) nm_system_device_set_ip4_route (active_device, nm_ip4_config_get_gateway (ad_config), nm_ip4_config_get_gateway (config), 0xFFFFFFFF); - if (iface != NULL) + if (iface != NULL && strlen (iface)) { nm_system_device_set_up_down_with_iface (NULL, iface, TRUE); diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 93a081bbf1..a93ec9257c 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -128,7 +128,7 @@ gboolean nm_vpn_connection_set_config (NMVPNConnection *connection, const char * g_return_val_if_fail (ip4_config != NULL, FALSE); /* IPsec VPNs will not have tunnel device */ - if (vpn_iface != NULL) + if (vpn_iface != NULL && strlen (vpn_iface)) nm_vpn_connection_set_vpn_iface (connection, vpn_iface); nm_vpn_connection_set_parent_device (connection, dev); nm_vpn_connection_set_ip4_config (connection, ip4_config);