Commit d9798da0 authored by Alexey Torkhov's avatar Alexey Torkhov

Don't create unused secrets file.

parent 37a93a73
...@@ -841,8 +841,6 @@ nm_l2tp_start_l2tpd_binary (NML2tpPlugin *plugin, ...@@ -841,8 +841,6 @@ nm_l2tp_start_l2tpd_binary (NML2tpPlugin *plugin,
g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup ("-D")); g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup ("-D"));
g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup ("-c")); g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup ("-c"));
g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup_printf ("/var/run/nm-xl2tpd.conf.%d", my_pid)); g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup_printf ("/var/run/nm-xl2tpd.conf.%d", my_pid));
g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup ("-s"));
g_ptr_array_add (l2tpd_argv, (gpointer) g_strdup_printf ("/var/run/nm-l2tp-secrets.%d", my_pid));
g_ptr_array_add (l2tpd_argv, NULL); g_ptr_array_add (l2tpd_argv, NULL);
if (!g_spawn_async (NULL, (char **) l2tpd_argv->pdata, NULL, if (!g_spawn_async (NULL, (char **) l2tpd_argv->pdata, NULL,
...@@ -891,7 +889,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin, ...@@ -891,7 +889,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin,
gint fdtmp1 = -1; gint fdtmp1 = -1;
gint conf_fd = -1; gint conf_fd = -1;
gint pppopt_fd = -1; gint pppopt_fd = -1;
gint secret_fd = -1;
filename = g_strdup_printf ("/var/run/nm-xl2tpd.conf.%d", pid); filename = g_strdup_printf ("/var/run/nm-xl2tpd.conf.%d", pid);
conf_fd = open (filename, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR); conf_fd = open (filename, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
...@@ -920,21 +917,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin, ...@@ -920,21 +917,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin,
return FALSE; return FALSE;
} }
filename = g_strdup_printf ("/var/run/nm-l2tp-secrets.%d", pid);
secret_fd = open (filename, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
g_free (filename);
if (secret_fd == -1) {
close(conf_fd);
close(pppopt_fd);
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
"%s",
"Could not write secrets.");
return FALSE;
}
/* L2TP options */ /* L2TP options */
write_config_option (conf_fd, "[global]\n"); write_config_option (conf_fd, "[global]\n");
write_config_option (conf_fd, "access control = yes\n"); write_config_option (conf_fd, "access control = yes\n");
...@@ -1076,7 +1058,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin, ...@@ -1076,7 +1058,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin,
close(conf_fd); close(conf_fd);
close(pppopt_fd); close(pppopt_fd);
close(secret_fd);
return TRUE; return TRUE;
} }
......
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