s3-spoolss: use pidl for _spoolss_StartDocPrinter.

Guenther

diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 44551e391bbb7650935fb65a80df76fe4517bb2f..667e9ee38646f8c78e5c48609fbb4146e6ca8a0c 100644 (file)
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -386,27 +386,7 @@ static bool api_spoolss_endpageprinter(pipes_struct *p)
 
 static bool api_spoolss_startdocprinter(pipes_struct *p)
 {
-       SPOOL_Q_STARTDOCPRINTER q_u;
-       SPOOL_R_STARTDOCPRINTER 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_startdocprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_startdocprinter: unable to unmarshall SPOOL_Q_STARTDOCPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_startdocprinter(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_startdocprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_startdocprinter: unable to marshall SPOOL_R_STARTDOCPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_STARTDOCPRINTER);
 }
 
 /********************************************************************

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 1312b2ec1656a930ee631f0ca80533d17df11365..1cdba229d12e17bb83b22dd93adf6b17d0a82416 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5905,29 +5905,31 @@ WERROR _spoolss_EndPagePrinter(pipes_struct *p,
        return WERR_OK;
 }
 
-/********************************************************************
- * api_spoolss_getprinter
- * called from the spoolss dispatcher
- *
- ********************************************************************/
+/****************************************************************
+ _spoolss_StartDocPrinter
+****************************************************************/
 
-WERROR _spoolss_startdocprinter(pipes_struct *p, SPOOL_Q_STARTDOCPRINTER *q_u, SPOOL_R_STARTDOCPRINTER *r_u)
+WERROR _spoolss_StartDocPrinter(pipes_struct *p,
+                               struct spoolss_StartDocPrinter *r)
 {
-       POLICY_HND *handle = &q_u->handle;
-       DOC_INFO *docinfo = &q_u->doc_info_container.docinfo;
-       uint32 *jobid = &r_u->jobid;
-       TALLOC_CTX *ctx = p->mem_ctx;
-       DOC_INFO_1 *info_1 = &docinfo->doc_info_1;
+       POLICY_HND *handle = r->in.handle;
+       uint32_t *jobid = r->out.job_id;
+       struct spoolss_DocumentInfo1 *info_1;
        int snum;
-       char *jobname = NULL;
-       fstring datatype;
        Printer_entry *Printer = find_printer_index_by_hnd(p, handle);
 
        if (!Printer) {
-               DEBUG(2,("_spoolss_startdocprinter: Invalid handle (%s:%u:%u)\n", OUR_HANDLE(handle)));
+               DEBUG(2,("_spoolss_StartDocPrinter: "
+                       "Invalid handle (%s:%u:%u)\n", OUR_HANDLE(handle)));
                return WERR_BADFID;
        }
 
+       if (r->in.level != 1) {
+               return WERR_UNKNOWN_LEVEL;
+       }
+
+       info_1 = r->in.info.info1;
+
        /*
         * a nice thing with NT is it doesn't listen to what you tell it.
         * when asked to send _only_ RAW datas, it tries to send datas
@@ -5936,9 +5938,8 @@ WERROR _spoolss_startdocprinter(pipes_struct *p, SPOOL_Q_STARTDOCPRINTER *q_u, S
         * So I add checks like in NT Server ...
         */
 
-       if (info_1->p_datatype != 0) {
-               unistr2_to_ascii(datatype, &info_1->datatype, sizeof(datatype));
-               if (strcmp(datatype, "RAW") != 0) {
+       if (info_1->datatype) {
+               if (strcmp(info_1->datatype, "RAW") != 0) {
                        (*jobid)=0;
                        return WERR_INVALID_DATATYPE;
                }
@@ -5949,9 +5950,8 @@ WERROR _spoolss_startdocprinter(pipes_struct *p, SPOOL_Q_STARTDOCPRINTER *q_u, S
                return WERR_BADFID;
        }
 
-       jobname = unistr2_to_ascii_talloc(ctx, &info_1->docname);
-
-       Printer->jobid = print_job_start(p->server_info, snum, jobname,
+       Printer->jobid = print_job_start(p->server_info, snum,
+                                        CONST_DISCARD(char *,info_1->document_name),
                                         Printer->nt_devmode);
 
        /* An error occured in print_job_start() so return an appropriate
@@ -10222,17 +10222,6 @@ WERROR _spoolss_GetPrintProcessorDirectory(pipes_struct *p,
        return WERR_NOT_SUPPORTED;
 }
 
-/****************************************************************
- _spoolss_StartDocPrinter
-****************************************************************/
-
-WERROR _spoolss_StartDocPrinter(pipes_struct *p,
-                               struct spoolss_StartDocPrinter *r)
-{
-       p->rng_fault_state = true;
-       return WERR_NOT_SUPPORTED;
-}
-
 /****************************************************************
  _spoolss_ReadPrinter
 ****************************************************************/