fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-05 11:20:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-02-02 Robert Love <rml@novell.com>

Browse source 
Patch by Sureshkumar T <tsureshkumar@novell.com>:
	* 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
This commit is contained in:
Robert Love 2006-02-02 15:07:35 +00:00 • committed by Robert Love
parent 4b328ce7d3
commit 3abc236427
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,9 @@
2006-02-02 Robert Love <rml@novell.com>
Patch by Sureshkumar T <tsureshkumar@novell.com>:
* src/vpn-manager/nm-vpn-connection.c, src/NetworkManagerSystem.c:
Check for and handle empty string for iface.
2006-02-01 Robert Love <rml@novell.com>
* 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.

2
src/NetworkManagerSystem.c
View file

@ -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);

2
src/vpn-manager/nm-vpn-connection.c
View file

@ -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);