colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-09-29 Dan Williams <dcbw@redhat.com>

Browse Source 
Patch from Robert Buchholz <rbu@gentoo.org>

	* 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
This commit is contained in:
Dan Williams
2008-09-29 21:11:05 +00:00
parent 453940a799
commit 0b4cd09b18
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vpn-daemons/openvpn/ChangeLog
View File

@@ -1,3 +1,11 @@
2008-09-29 Dan Williams <dcbw@redhat.com>
Patch from Robert Buchholz <rbu@gentoo.org>
* 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 <dcbw@redhat.com> 2008-09-24 Dan Williams <dcbw@redhat.com>
* common-gnome/* * common-gnome/*

2
vpn-daemons/openvpn/src/nm-openvpn-service.c
View File

@@ -452,7 +452,7 @@ openvpn_watch_cb (GPid pid, gint status, gpointer user_data)
} }
/* Try to get the last bits of data from openvpn */ /* 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; GIOChannel *channel = priv->io_data->socket_channel;
GIOCondition condition; GIOCondition condition;