s3-spoolss: use pidl for _spoolss_WritePrinter.

Guenther

diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 4e86e196876266a2b2a99d7b67a0b237c0f85a67..dd8bf0d4ddcff6c4c8f7595d9be099cdab87e623 100644 (file)
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -463,27 +463,7 @@ static bool api_spoolss_enddocprinter(pipes_struct *p)
 
 static bool api_spoolss_writeprinter(pipes_struct *p)
 {
-       SPOOL_Q_WRITEPRINTER q_u;
-       SPOOL_R_WRITEPRINTER r_u;
-       prs_struct *data = &p->in_data.data;
-       prs_struct *rdata = &p->out_data.rdata;
-
-       ZERO_STRUCT(q_u);
-       ZERO_STRUCT(r_u);
-
-       if(!spoolss_io_q_writeprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_writeprinter: unable to unmarshall SPOOL_Q_WRITEPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_writeprinter(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_writeprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_writeprinter: unable to marshall SPOOL_R_WRITEPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_WRITEPRINTER);
 }
 
 /****************************************************************************

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 97280c28277be69439a84d709f96d2d5f5358d68..fd1babe9f2bf1353f17a06eebc732f1e951cf1b7 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5902,21 +5902,24 @@ WERROR _spoolss_EndDocPrinter(pipes_struct *p,
        return _spoolss_enddocprinter_internal(p, handle);
 }
 
-/****************************************************************************
-****************************************************************************/
+/****************************************************************
+ _spoolss_WritePrinter
+****************************************************************/
 
-WERROR _spoolss_writeprinter(pipes_struct *p, SPOOL_Q_WRITEPRINTER *q_u, SPOOL_R_WRITEPRINTER *r_u)
+WERROR _spoolss_WritePrinter(pipes_struct *p,
+                            struct spoolss_WritePrinter *r)
 {
-       POLICY_HND *handle = &q_u->handle;
-       uint32 buffer_size = q_u->buffer_size;
-       uint8 *buffer = q_u->buffer;
-       uint32 *buffer_written = &q_u->buffer_size2;
+       POLICY_HND *handle = r->in.handle;
+       uint32 buffer_size = r->in._data_size;
+       uint8 *buffer = r->in.data.data;
+       uint32 *buffer_written = &r->in._data_size;
        int snum;
        Printer_entry *Printer = find_printer_index_by_hnd(p, handle);
 
        if (!Printer) {
-               DEBUG(2,("_spoolss_writeprinter: Invalid handle (%s:%u:%u)\n",OUR_HANDLE(handle)));
-               r_u->buffer_written = q_u->buffer_size2;
+               DEBUG(2,("_spoolss_WritePrinter: Invalid handle (%s:%u:%u)\n",
+                       OUR_HANDLE(handle)));
+               *r->out.num_written = r->in._data_size;
                return WERR_BADFID;
        }
 
@@ -5926,14 +5929,14 @@ WERROR _spoolss_writeprinter(pipes_struct *p, SPOOL_Q_WRITEPRINTER *q_u, SPOOL_R
        (*buffer_written) = (uint32)print_job_write(snum, Printer->jobid, (const char *)buffer,
                                        (SMB_OFF_T)-1, (size_t)buffer_size);
        if (*buffer_written == (uint32)-1) {
-               r_u->buffer_written = 0;
+               *r->out.num_written = 0;
                if (errno == ENOSPC)
                        return WERR_NO_SPOOL_SPACE;
                else
                        return WERR_ACCESS_DENIED;
        }
 
-       r_u->buffer_written = q_u->buffer_size2;
+       *r->out.num_written = r->in._data_size;
 
        return WERR_OK;
 }
@@ -10139,17 +10142,6 @@ WERROR _spoolss_StartDocPrinter(pipes_struct *p,
        return WERR_NOT_SUPPORTED;
 }
 
-/****************************************************************
- _spoolss_WritePrinter
-****************************************************************/
-
-WERROR _spoolss_WritePrinter(pipes_struct *p,
-                            struct spoolss_WritePrinter *r)
-{
-       p->rng_fault_state = true;
-       return WERR_NOT_SUPPORTED;
-}
-
 /****************************************************************
  _spoolss_ReadPrinter
 ****************************************************************/