From: Jeremy Allison <jra@samba.org>
Date: Thu, 31 May 2018 17:35:48 +0000 (-0700)
Subject: s3: smbd: printing: Re-implement delete-on-close semantics for print files missing... 
X-Git-Tag: tevent-0.9.37~431
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=364175b359f018c8641359440fa07b0ea567b045

s3: smbd: printing: Re-implement delete-on-close semantics for print files missing since 3.5.x.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13457

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jun  1 20:32:03 CEST 2018 on sn-devel-144
---

diff --git a/selftest/knownfail.d/smbspool b/selftest/knownfail.d/smbspool
deleted file mode 100644
index a61fc4dca5d..00000000000
--- a/selftest/knownfail.d/smbspool
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.blackbox.smbspool.delete.on.close
diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index 60002020351..9d565de120a 100644
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -309,6 +309,23 @@ void print_spool_end(files_struct *fsp, enum file_close_type close_type)
 	WERROR werr;
 	struct dcerpc_binding_handle *b = NULL;
 
+	if (fsp->fh->private_options &
+	    NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE) {
+		int ret;
+
+		/*
+		 * Job was requested to be cancelled by setting
+		 * delete on close so truncate the job file.
+		 * print_job_end() which is called from
+		 * _spoolss_EndDocPrinter() will take
+		 * care of deleting it for us.
+		 */
+		ret = ftruncate(fsp->fh->fd, 0);
+		if (ret == -1) {
+			DBG_ERR("ftruncate failed: %s\n", strerror(errno));
+		}
+	}
+
 	b = fsp->conn->spoolss_pipe->binding_handle;
 
 	switch (close_type) {