21696066 backport upstream 4124 for ZFSSA
authorTomas Klacko <tomas.klacko@oracle.com>
Fri, 28 Aug 2015 07:46:44 -0700
changeset 4821 54dafbe33fdb
parent 4818 058cb786874f
child 4822 1fb8a14c6702
21696066 backport upstream 4124 for ZFSSA
components/proftpd/patches/014-21696066-4124.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/proftpd/patches/014-21696066-4124.patch	Fri Aug 28 07:46:44 2015 -0700
@@ -0,0 +1,16 @@
+http://bugs.proftpd.org/show_bug.cgi?id=4124
+https://patch-diff.githubusercontent.com/raw/proftpd/proftpd/pull/60.patch
+
+diff --git a/modules/mod_xfer.c b/modules/mod_xfer.c
+index ddd4f34..339f89a 100644
+--- a/modules/mod_xfer.c
++++ b/modules/mod_xfer.c
[email protected]@ -974,7 +974,7 @@ static void stor_abort(void) {
+ 
+   } else if (session.xfer.path) {
+     delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores", FALSE);
+-    if (delete_stores == NULL ||
++    if (delete_stores != NULL &&
+         *delete_stores == TRUE) {
+       pr_log_debug(DEBUG5, "removing aborted file '%s'", session.xfer.path);
+       pr_fsio_unlink(session.xfer.path);