Skip to content

N
NetworkManager-l2tp
Commit cbfdb0c0 authored by Alexey Torkhov's avatar Alexey Torkhov
Browse files
Options

Cleaning up config files after xl2tpd exit.

parent d9798da0
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 0 deletions
src/nm-l2tp-service.c
View file @ cbfdb0c0
...@@ -564,6 +564,8 @@ l2tpd_watch_cb (GPid pid, gint status, gpointer user_data) ...@@ -564,6 +564,8 @@ l2tpd_watch_cb (GPid pid, gint status, gpointer user_data)
NML2tpPlugin *plugin = NM_L2TP_PLUGIN (user_data); NML2tpPlugin *plugin = NM_L2TP_PLUGIN (user_data);
NML2tpPluginPrivate *priv = NM_L2TP_PLUGIN_GET_PRIVATE (plugin); NML2tpPluginPrivate *priv = NM_L2TP_PLUGIN_GET_PRIVATE (plugin);
guint error = 0; guint error = 0;
pid_t my_pid = getpid ();
char *filename;
if (WIFEXITED (status)) { if (WIFEXITED (status)) {
error = WEXITSTATUS (status); error = WEXITSTATUS (status);
...@@ -581,6 +583,15 @@ l2tpd_watch_cb (GPid pid, gint status, gpointer user_data) ...@@ -581,6 +583,15 @@ l2tpd_watch_cb (GPid pid, gint status, gpointer user_data)
waitpid (priv->pid, NULL, WNOHANG); waitpid (priv->pid, NULL, WNOHANG);
priv->pid = 0; priv->pid = 0;
/* Cleaning up config files */
filename = g_strdup_printf ("/var/run/nm-xl2tpd.conf.%d", my_pid);
unlink(filename);
g_free(filename);
filename = g_strdup_printf ("/var/run/nm-ppp-options.xl2tpd.%d", my_pid);
unlink(filename);
g_free(filename);
/* Must be after data->state is set since signals use data->state */ /* Must be after data->state is set since signals use data->state */
switch (error) { switch (error) {
case 16: case 16:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment