[network-manager-vpnc] core: set pid_file before trying to use it



commit c37a79d43ebe1192ba8dcc5036cd668631b6473e
Author: Dan Williams <dcbw redhat com>
Date:   Fri Jan 31 11:24:18 2014 -0600

    core: set pid_file before trying to use it
    
    nm_vpnc_start_vpnc_binary() uses priv->pid_file, so clearly it should
    be set before calling that function.

 src/nm-vpnc-service.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/nm-vpnc-service.c b/src/nm-vpnc-service.c
index 489163b..02d8bc8 100644
--- a/src/nm-vpnc-service.c
+++ b/src/nm-vpnc-service.c
@@ -568,12 +568,12 @@ real_connect (NMVPNPlugin   *plugin,
        if (!nm_vpnc_secrets_validate (s_vpn, error))
                goto out;
 
+       priv->pid_file = g_strdup_printf (NM_VPNC_PID_PATH "/nm-vpnc-%s.pid", nm_connection_get_uuid 
(connection));
+
        vpnc_fd = nm_vpnc_start_vpnc_binary (NM_VPNC_PLUGIN (plugin), error);
        if (vpnc_fd < 0)
                goto out;
 
-       priv->pid_file = g_strdup_printf (NM_VPNC_PID_PATH "/nm-vpnc-%s.pid", nm_connection_get_uuid 
(connection));
-
        if (getenv ("NM_VPNC_DUMP_CONNECTION") || debug)
                nm_connection_dump (connection);
 


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