[network-manager-openswan: 9/25] core: remove commented code
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openswan: 9/25] core: remove commented code
- Date: Mon, 20 Oct 2014 15:44:19 +0000 (UTC)
commit 08d7c64581265bbf39eff33a5e6980414892e98e
Author: Dan Williams <dcbw redhat com>
Date: Mon Aug 4 15:48:46 2014 -0500
core: remove commented code
src/nm-openswan-service-helper.c | 10 ----------
src/nm-openswan-service.c | 14 --------------
2 files changed, 0 insertions(+), 24 deletions(-)
---
diff --git a/src/nm-openswan-service-helper.c b/src/nm-openswan-service-helper.c
index 8d6f3f3..c468a22 100644
--- a/src/nm-openswan-service-helper.c
+++ b/src/nm-openswan-service-helper.c
@@ -249,16 +249,6 @@ main (int argc, char *argv[])
g_value_set_string (val, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE);
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
-#if 0
- /* Tunnel device */
- //val = str_to_gvalue (getenv ("TUNDEV"), FALSE);
- //val = str_to_gvalue ("tun0", FALSE);
- if (val)
- g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
- else
- helper_failed (connection, "Tunnel Device");
-#endif
-
/* IP address */
val = addr_to_gvalue (getenv ("PLUTO_MY_SOURCEIP"));
if (val)
diff --git a/src/nm-openswan-service.c b/src/nm-openswan-service.c
index e39878b..86426af 100644
--- a/src/nm-openswan-service.c
+++ b/src/nm-openswan-service.c
@@ -394,7 +394,6 @@ write_config_option (int fd, const char *format, ...)
}
typedef struct {
- //int fd;
int conf_fd;
int secret_fd;
NMSettingVPN *s_vpn;
@@ -691,19 +690,6 @@ real_need_secrets (NMVPNPlugin *plugin,
return FALSE;
}
-#if 0
-static gboolean
-ensure_killed (gpointer data)
-{
- int pid = GPOINTER_TO_INT (data);
-
- if (kill (pid, 0) == 0)
- kill (pid, SIGKILL);
-
- return FALSE;
-}
-#endif
-
static gboolean
real_disconnect (NMVPNPlugin *plugin,
GError **error)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]