From 56240ef58789284cabce428dba5be87c21d68f95 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Thu, 23 Jun 2005 18:59:15 +0000 Subject: [PATCH] 2005-06-23 David Zeuthen * properties/nm-vpnc.c (import_from_file): Allow "Description=" to be the empty string (reported by Bill Moss ). git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@739 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/vpnc/ChangeLog | 5 +++++ vpn-daemons/vpnc/properties/nm-vpnc.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index e8bdbb724..4ac220308 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,8 @@ +2005-06-23 David Zeuthen + + * properties/nm-vpnc.c (import_from_file): Allow "Description=" to be + the empty string (reported by Bill Moss ). + 2005-06-17 David Zeuthen * configure.in, Makefile.am: Various fixes such that 'make distcheck' diff --git a/vpn-daemons/vpnc/properties/nm-vpnc.c b/vpn-daemons/vpnc/properties/nm-vpnc.c index 1bc21b4af..14377450d 100644 --- a/vpn-daemons/vpnc/properties/nm-vpnc.c +++ b/vpn-daemons/vpnc/properties/nm-vpnc.c @@ -512,8 +512,7 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path) routes = g_strdup (""); /* sanity check data */ - if (! (strlen (connectionname) > 0 && - strlen (gateway) > 0 && + if (! (strlen (gateway) > 0 && strlen (groupname) > 0)) goto error;