08f137fc11
- Fixed 926225 - Fixed dependency to libreswan. - Created a new sub package NetworkManager-openswan-gnome - Various other spec file fixes. - Additional code changes are as follows: - Fixed an issue where proper network stack is not loaded unless _stackmanager is run before starting pluto daemon service. - Fixed the termination operation of pluto daemon to comply with libreswan changes. - Fixed various debug messages. - Fixed initiation of pluto daemon by this plugin to reflect the changes in libreaswan. - Fixed defaults values for more parameters to help the VPN connection stay more reliable. - Rewrote pluto watch API which watches the pluto process for its status. Fixed memory leak issues as not all child processes were reaped correctly. Also g_spwan_close_pid was not being called after children were reaped. Also modified debugs and added more to help with debugging in the future. - Fixed an issue where nm-openswan service is searching for ipsec binary in both /sbin and /usr/sbin leading to same operation twice, as /sbin is just symlink to /usr/sbin, so removed /sbin from the search paths. - Fixed some libreswan related macro changes. - Fixed netmask issue when sending IP information to the nm openswan plugin service. - Fixed the current code as it does not set the default route field NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT when sending VPN information to nm-openswan plugin. This fix sets the field to TRUE. - Fixed some issues found by coverity scan. - Fixed an issue where writing configuration on stdin should not end with \n as it gives error. It used to work previously, but not with latest NetworkManager versions. - libreswan related fixes, as some macros have been modified after forking to libreswan from openswan. - openswan/libreswan does not provide tun0 interface, so fixed the code where it sends tun0 interface. - Fix prcoessing of nm-openswan-dialog.ui file and added more error notifications. - Fixed dead code based on coverity scan. - Fixed gnomekeyring lib dependencies. - Fixed Networkmanager and related lib dependencies. - Fixed gtk label max width issue by setting it to 35. - NM-openswan was missing support for nm-openswan-auth-dialog.desktop.in.in. So added a new nm-openswan-auth-dialog.desktop.in.in, and modified related Makefile and configure.ac files.
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 27c17d7d805ad87632872cf2ded5237fc59159dd Mon Sep 17 00:00:00 2001
|
|
From: Avesh Agarwal <avagarwa@redhat.com>
|
|
Date: Tue, 10 Dec 2013 15:25:35 -0500
|
|
Subject: [PATCH 19/20] Fixed the termination operation of pluto daemon to
|
|
comply with libreswan changes.
|
|
|
|
---
|
|
src/nm-openswan-service.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/nm-openswan-service.c b/src/nm-openswan-service.c
|
|
index fffd020..af541bd 100644
|
|
--- a/src/nm-openswan-service.c
|
|
+++ b/src/nm-openswan-service.c
|
|
@@ -769,20 +769,21 @@ real_disconnect (NMVPNPlugin *plugin,
|
|
}
|
|
|
|
openswan_argv = g_ptr_array_new ();
|
|
- g_ptr_array_add (openswan_argv, (gpointer) (*openswan_binary));
|
|
- g_ptr_array_add (openswan_argv, (gpointer) "setup");
|
|
- g_ptr_array_add (openswan_argv, (gpointer) "stop");
|
|
+ g_ptr_array_add (openswan_argv, (gpointer) "/usr/libexec/ipsec/whack");
|
|
+ g_ptr_array_add (openswan_argv, (gpointer) "--shutdown");
|
|
+ //g_ptr_array_add (openswan_argv, (gpointer) (*openswan_binary));
|
|
+ //g_ptr_array_add (openswan_argv, (gpointer) "setup");
|
|
+ //g_ptr_array_add (openswan_argv, (gpointer) "stop");
|
|
g_ptr_array_add (openswan_argv, NULL);
|
|
|
|
if (!g_spawn_async (NULL, (char **) openswan_argv->pdata, NULL,
|
|
0, NULL, NULL, NULL, error)) {
|
|
g_ptr_array_free (openswan_argv, TRUE);
|
|
- g_warning ("Openswan (pluto) failed to stop. error: '%s'", (*error)->message);
|
|
+ g_printf ("ipsec (pluto) failed to stop. error: '%s'\n", (*error)->message);
|
|
return -1;
|
|
}
|
|
g_ptr_array_free (openswan_argv, TRUE);
|
|
|
|
-
|
|
return TRUE;
|
|
}
|
|
|
|
--
|
|
1.8.3.1
|
|
|