summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/client_connect_tmp_files.patch39
-rw-r--r--debian/patches/series1
3 files changed, 47 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index daf48a8..453e133 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openvpn (2.3.4-3) unstable; urgency=medium
+
+ * Apply patch by Samuel Thibault to clean up temporary files.
+ (Closes: #764651). Thanks Samuel!
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org> Mon, 13 Oct 2014 18:24:03 +0200
+
openvpn (2.3.4-2) unstable; urgency=medium
* openvpn.service. Remove ExecStop, add ExecReload.
diff --git a/debian/patches/client_connect_tmp_files.patch b/debian/patches/client_connect_tmp_files.patch
new file mode 100644
index 0000000..6770287
--- /dev/null
+++ b/debian/patches/client_connect_tmp_files.patch
@@ -0,0 +1,39 @@
+Index: openvpn/src/openvpn/multi.c
+===================================================================
+--- openvpn.orig/src/openvpn/multi.c 2014-10-13 18:23:19.340637895 +0200
++++ openvpn/src/openvpn/multi.c 2014-10-13 18:23:19.336637895 +0200
+@@ -1452,10 +1452,6 @@
+ option_types_found,
+ mi->context.c2.es);
+
+- if (!platform_unlink (dc_file))
+- msg (D_MULTI_ERRORS, "MULTI: problem deleting temporary file: %s",
+- dc_file);
+-
+ /*
+ * If the --client-connect script generates a config file
+ * with an --ifconfig-push directive, it will override any
+@@ -1698,6 +1694,11 @@
+ multi_client_connect_post (m, mi, dc_file, option_permissions_mask, &option_types_found);
+ ++cc_succeeded_count;
+ }
++
++ if (!platform_unlink (dc_file))
++ msg (D_MULTI_ERRORS, "MULTI: problem deleting temporary file: %s",
++ dc_file);
++
+ script_depr_failed:
+ argv_reset (&argv);
+ }
+@@ -1751,6 +1752,11 @@
+ }
+ else
+ cc_succeeded = false;
++
++ if (!platform_unlink (dc_file))
++ msg (D_MULTI_ERRORS, "MULTI: problem deleting temporary file: %s",
++ dc_file);
++
+ script_failed:
+ argv_reset (&argv);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index d9cae0f..a6f52d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ kfreebsd_support.patch
accommodate_typo.patch
manpage_fixes.patch
better_systemd_detection.patch
+client_connect_tmp_files.patch