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

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

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

vendor/current/source3/printing/printspoolss.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing.h"
 #include "rpc_client/rpc_client.h"
@@ -26 +27 @@
 #include "../libcli/security/security.h"
 
+struct print_file_data {
+        char *svcname;
+        char *docname;
+        char *filename;
+        struct policy_handle handle;
+        uint32_t jobid;
+        uint16_t rap_jobid;
+};
+
+uint16_t print_spool_rap_jobid(struct print_file_data *print_file)
+{
+        if (print_file == NULL) {
+                return 0;
+        }
+
+        return print_file->rap_jobid;
+}
+
 void print_spool_terminate(struct connection_struct *conn,
                            struct print_file_data *print_file);
@@ -40 +59 @@
 NTSTATUS print_spool_open(files_struct *fsp,
                           const char *fname,
-                          uint16_t current_vuid)
+                          uint64_t current_vuid)
 {
         NTSTATUS status;
@@ -47 +66 @@
         struct dcerpc_binding_handle *b = NULL;
         struct spoolss_DevmodeContainer devmode_ctr;
-        union spoolss_DocumentInfo info;
+        struct spoolss_DocumentInfoCtr info_ctr;
+        struct spoolss_DocumentInfo1 *info1;
         int fd = -1;
         WERROR werr;
+        mode_t mask;
 
         tmp_ctx = talloc_new(fsp);
@@ -61 +82 @@
                 goto done;
         }
-        pf->svcname = talloc_strdup(pf, lp_servicename(SNUM(fsp->conn)));
+        pf->svcname = lp_servicename(pf, SNUM(fsp->conn));
 
         /* the document name is derived from the file name.
@@ -101 +122 @@
 
         pf->filename = talloc_asprintf(pf, "%s/%sXXXXXX",
-                                        lp_pathname(SNUM(fsp->conn)),
+                                        lp_path(talloc_tos(),
+                                                SNUM(fsp->conn)),
                                         PRINT_SPOOL_PREFIX);
         if (!pf->filename) {
@@ -108 +130 @@
         }
         errno = 0;
+        mask = umask(S_IRWXO | S_IRWXG);
         fd = mkstemp(pf->filename);
+        umask(mask);
         if (fd == -1) {
                 if (errno == EACCES) {
@@ -131 +155 @@
 
         status = rpc_pipe_open_interface(fsp->conn,
-                                         &ndr_table_spoolss.syntax_id,
+                                         &ndr_table_spoolss,
                                          fsp->conn->session_info,
-                                         &fsp->conn->sconn->client_id,
+                                         fsp->conn->sconn->remote_address,
                                          fsp->conn->sconn->msg_ctx,
                                          &fsp->conn->spoolss_pipe);
@@ -155 +179 @@
         }
 
-        info.info1 = talloc(tmp_ctx, struct spoolss_DocumentInfo1);
-        if (!info.info1) {
-                status = NT_STATUS_NO_MEMORY;
-                goto done;
-        }
-        info.info1->document_name = pf->docname;
-        info.info1->output_file = pf->filename;
-        info.info1->datatype = "RAW";
-
-        status = dcerpc_spoolss_StartDocPrinter(b, tmp_ctx, &pf->handle,
-                                                1, info, &pf->jobid, &werr);
+        info1 = talloc(tmp_ctx, struct spoolss_DocumentInfo1);
+        if (info1 == NULL) {
+                status = NT_STATUS_NO_MEMORY;
+                goto done;
+        }
+        info1->document_name = pf->docname;
+        info1->output_file = pf->filename;
+        info1->datatype = "RAW";
+
+        info_ctr.level = 1;
+        info_ctr.info.info1 = info1;
+
+        status = dcerpc_spoolss_StartDocPrinter(b, tmp_ctx,
+                                                &pf->handle,
+                                                &info_ctr,
+                                                &pf->jobid,
+                                                &werr);
         if (!NT_STATUS_IS_OK(status)) {
                 goto done;
@@ -183 +213 @@
 
         /* setup a full fsp */
-        status = create_synthetic_smb_fname(fsp, pf->filename, NULL,
-                                            NULL, &fsp->fsp_name);
-        if (!NT_STATUS_IS_OK(status)) {
+        fsp->fsp_name = synthetic_smb_fname(fsp, pf->filename, NULL, NULL);
+        if (fsp->fsp_name == NULL) {
+                status = NT_STATUS_NO_MEMORY;
                 goto done;
         }
@@ -195 +225 @@
 
         fsp->file_id = vfs_file_id_from_sbuf(fsp->conn, &fsp->fsp_name->st);
-        fsp->mode = fsp->fsp_name->st.st_ex_mode;
         fsp->fh->fd = fd;
 
@@ -220 +249 @@
                 }
                 /* We need to delete the job from spoolss too */
-                if (pf->jobid) {
+                if (pf && pf->jobid) {
                         print_spool_terminate(fsp->conn, pf);
                 }
@@ -230 +259 @@
 int print_spool_write(files_struct *fsp,
                       const char *data, uint32_t size,
-                      SMB_OFF_T offset, uint32_t *written)
+                      off_t offset, uint32_t *written)
 {
         SMB_STRUCT_STAT st;
@@ -315 +344 @@
 
         status = rpc_pipe_open_interface(conn,
-                                         &ndr_table_spoolss.syntax_id,
+                                         &ndr_table_spoolss,
                                          conn->session_info,
-                                         &conn->sconn->client_id,
+                                         conn->sconn->remote_address,
                                          conn->sconn->msg_ctx,
                                          &conn->spoolss_pipe);