[network-manager-openswan/dcbw/cleanups: 5/27] core: use G_SPAWN_DO_NOT_REAP_CHILD when starting initial pluto process



commit 993b3f4f7b090f5d18f58c423ceb1727329a132f
Author: Dan Williams <dcbw redhat com>
Date:   Mon Aug 4 15:11:56 2014 -0500

    core: use G_SPAWN_DO_NOT_REAP_CHILD when starting initial pluto process
    
    The child is already reaped with waitpid() in pluto_watch_cb().

 src/nm-openswan-service.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/src/nm-openswan-service.c b/src/nm-openswan-service.c
index 4405616..5579304 100644
--- a/src/nm-openswan-service.c
+++ b/src/nm-openswan-service.c
@@ -49,7 +49,6 @@ G_DEFINE_TYPE (NMOPENSWANPlugin, nm_openswan_plugin, NM_TYPE_VPN_PLUGIN)
 
 typedef struct {
        GPid pid;
-       GPid pid_auto;
 } NMOPENSWANPluginPrivate;
 
 #define NM_OPENSWAN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_OPENSWAN_PLUGIN, 
NMOPENSWANPluginPrivate))
@@ -299,7 +298,7 @@ nm_openswan_start_openswan_binary (NMOPENSWANPlugin *plugin, GError **error)
        g_ptr_array_add (openswan_argv, NULL);
 
        if (!g_spawn_async (NULL, (char **) openswan_argv->pdata, NULL,
-                                                        0, NULL, NULL, &pid, error)) {
+                                                        G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, error)) 
{
                g_ptr_array_free (openswan_argv, TRUE);
                g_warning ("pluto failed to start.  error: '%s'", (*error)->message);
                return -1;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]