Changeset 746 for vendor/current/source3/printing/printspoolss.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/printing/printspoolss.c (modified) (3 diffs)

vendor/current/source3/printing/printspoolss.c ¶

@@ -83 +83 @@
         }
 
-        /* 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
@@ -93 +94 @@
          * take over once we call EndDocPrinter().
          * Of course we will not start writing until
-         * StartDocPrinter() actually gives the ok. */
-
-        pf->filename = talloc_asprintf(pf, "%s/%s.XXXXXX",
+         * 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/%sXXXXXX",
                                         lp_pathname(SNUM(fsp->conn)),
                                         PRINT_SPOOL_PREFIX);
@@ -140 +145 @@
         status = dcerpc_spoolss_OpenPrinter(b, pf, pf->svcname,
                                             "RAW", devmode_ctr,
-                                            SEC_FLAG_MAXIMUM_ALLOWED,
+                                            PRINTER_ACCESS_USE,
                                             &pf->handle, &werr);
         if (!NT_STATUS_IS_OK(status)) {