From 0b4cd09b18c27f91fbd80d241bc11249b04b7d70 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 29 Sep 2008 21:11:05 +0000 Subject: [PATCH] 2008-09-29 Dan Williams Patch from Robert Buchholz * src/nm-openvpn-service.c - (openvpn_watch_cb): don't access socket_channel if it doesn't exist because openvpn exited before the management socket could be set up git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4121 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/openvpn/ChangeLog | 8 ++++++++ vpn-daemons/openvpn/src/nm-openvpn-service.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog index 0c20a2be9..cdece3609 100644 --- a/vpn-daemons/openvpn/ChangeLog +++ b/vpn-daemons/openvpn/ChangeLog @@ -1,3 +1,11 @@ +2008-09-29 Dan Williams + + Patch from Robert Buchholz + + * src/nm-openvpn-service.c + - (openvpn_watch_cb): don't access socket_channel if it doesn't exist + because openvpn exited before the management socket could be set up + 2008-09-24 Dan Williams * common-gnome/* diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service.c b/vpn-daemons/openvpn/src/nm-openvpn-service.c index ab9fc9a27..e65e2775e 100644 --- a/vpn-daemons/openvpn/src/nm-openvpn-service.c +++ b/vpn-daemons/openvpn/src/nm-openvpn-service.c @@ -452,7 +452,7 @@ openvpn_watch_cb (GPid pid, gint status, gpointer user_data) } /* Try to get the last bits of data from openvpn */ - if (priv->io_data) { + if (priv->io_data && priv->io_data->socket_channel) { GIOChannel *channel = priv->io_data->socket_channel; GIOCondition condition;