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

misc. compile fixes

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1263 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-01-04 18:06:34 +00:00
parent 0dcbec9372
commit e67fbad497
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,7 +199,7 @@ static gboolean send_config_info (DBusConnection *con,
* *
*/ */
#if 0 /* FIXME: Nothing uses this and it is static */
/** Prints all environment variables to /tmp/environ /** Prints all environment variables to /tmp/environ
*/ */
static void static void
@@ -212,6 +212,7 @@ print_env()
} }
fclose(f); fclose(f);
} }
#endif
/* /*

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

@@ -438,7 +438,6 @@ static gboolean
nm_openvpn_connect_timer_cb (NmOpenVPNData *data) nm_openvpn_connect_timer_cb (NmOpenVPNData *data)
{ {
struct sockaddr_in serv_addr; struct sockaddr_in serv_addr;
int tries = 0;
gboolean connected = FALSE; gboolean connected = FALSE;
gint socket_fd = -1; gint socket_fd = -1;
NmOpenVPN_IOData *io_data; NmOpenVPN_IOData *io_data;
@@ -1517,10 +1516,11 @@ main( int argc, char *argv[] )
vpn_data->loop = g_main_loop_new (NULL, FALSE); vpn_data->loop = g_main_loop_new (NULL, FALSE);
system ("/sbin/modprobe tun"); if (system ("/sbin/modprobe tun") == -1)
exit (EXIT_FAILURE);
if (!(vpn_data->con = nm_openvpn_dbus_init (vpn_data))) if (!(vpn_data->con = nm_openvpn_dbus_init (vpn_data)))
exit (1); exit (EXIT_FAILURE);
action.sa_handler = sigterm_handler; action.sa_handler = sigterm_handler;
sigemptyset (&block_mask); sigemptyset (&block_mask);
@@ -1537,5 +1537,5 @@ main( int argc, char *argv[] )
g_main_loop_unref (vpn_data->loop); g_main_loop_unref (vpn_data->loop);
g_free (vpn_data); g_free (vpn_data);
exit (0); exit (EXIT_SUCCESS);
} }