git.samba.org
/
ddiss
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e79f7a
)
s3-spoolss: remove duplicate "." in smbd spooler path
author
David Disseldorp
<ddiss@samba.org>
Wed, 1 Feb 2012 12:21:04 +0000
(13:21 +0100)
committer
David Disseldorp
<ddiss@samba.org>
Mon, 25 Jun 2012 11:07:55 +0000
(13:07 +0200)
source3/printing/printspoolss.c
patch
|
blob
|
history
diff --git
a/source3/printing/printspoolss.c
b/source3/printing/printspoolss.c
index 3d8b0d8b1bb7db88f9e17aa9fbda3147ab3817aa..23464d59b0b0425d9f04d1b9ba903c7ef94318a6 100644
(file)
--- a/
source3/printing/printspoolss.c
+++ b/
source3/printing/printspoolss.c
@@
-82,7
+82,8
@@
NTSTATUS print_spool_open(files_struct *fsp,
}
}
}
}
- /* Ok, now we have to open an actual file.
+ /*
+ * Ok, now we have to open an actual file.
* Here is the reason:
* We want to write the spool job to this file in
* smbd for scalability reason (and also because
* Here is the reason:
* We want to write the spool job to this file in
* smbd for scalability reason (and also because
@@
-92,9
+93,13
@@
NTSTATUS print_spool_open(files_struct *fsp,
* to spoolss in output_file so it can monitor and
* take over once we call EndDocPrinter().
* Of course we will not start writing until
* to spoolss in output_file so it can monitor and
* take over once we call EndDocPrinter().
* Of course we will not start writing until
- * StartDocPrinter() actually gives the ok. */
+ * StartDocPrinter() actually gives the ok.
+ * smbd spooler files do not include a print jobid
+ * path component, as the jobid is only known after
+ * calling StartDocPrinter().
+ */
- pf->filename = talloc_asprintf(pf, "%s/%s
.
XXXXXX",
+ pf->filename = talloc_asprintf(pf, "%s/%sXXXXXX",
lp_pathname(SNUM(fsp->conn)),
PRINT_SPOOL_PREFIX);
if (!pf->filename) {
lp_pathname(SNUM(fsp->conn)),
PRINT_SPOOL_PREFIX);
if (!pf->filename) {