s3-spoolss: use pidl for _spoolss_AddPrinterEx.
[tprouty/samba.git] / source3 / rpc_server / srv_spoolss.c
old mode 100755 (executable)
new mode 100644 (file)
index a903ae9..02b3220
@@ -10,7 +10,7 @@
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
@@ -19,8 +19,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-/********************************************************************
- * api_spoolss_open_printer_ex (rarely seen - older call)
+/*******************************************************************
  ********************************************************************/
 
-static BOOL api_spoolss_open_printer(pipes_struct *p)
+static bool proxy_spoolss_call(pipes_struct *p, uint8_t opnum)
 {
-       SPOOL_Q_OPEN_PRINTER q_u;
-       SPOOL_R_OPEN_PRINTER r_u;
-       prs_struct *data = &p->in_data.data;
-       prs_struct *rdata = &p->out_data.rdata;
+       struct api_struct *fns;
+       int n_fns;
 
-       ZERO_STRUCT(q_u);
-       ZERO_STRUCT(r_u);
+       spoolss_get_pipe_fns(&fns, &n_fns);
 
-       if (!spoolss_io_q_open_printer("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_open_printer: unable to unmarshall SPOOL_Q_OPEN_PRINTER.\n"));
-               return False;
+       if (opnum >= n_fns) {
+               return false;
        }
 
-       r_u.status = _spoolss_open_printer( p, &q_u, &r_u);
-       
-       if (!spoolss_io_r_open_printer("",&r_u,rdata,0)){
-               DEBUG(0,("spoolss_io_r_open_printer: unable to marshall SPOOL_R_OPEN_PRINTER.\n"));
-               return False;
+       if (fns[opnum].opnum != opnum) {
+               smb_panic("SPOOLSS function table not sorted");
        }
 
-       return True;
+       return fns[opnum].fn(p);
 }
 
-
 /********************************************************************
- * api_spoolss_open_printer_ex
+ * api_spoolss_open_printer_ex (rarely seen - older call)
  ********************************************************************/
 
-static BOOL api_spoolss_open_printer_ex(pipes_struct *p)
+static bool api_spoolss_open_printer(pipes_struct *p)
 {
-       SPOOL_Q_OPEN_PRINTER_EX q_u;
-       SPOOL_R_OPEN_PRINTER_EX 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_open_printer_ex("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_open_printer_ex: unable to unmarshall SPOOL_Q_OPEN_PRINTER_EX.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_open_printer_ex( p, &q_u, &r_u);
+       return proxy_spoolss_call(p, NDR_SPOOLSS_OPENPRINTER);
+}
 
-       if (!spoolss_io_r_open_printer_ex("",&r_u,rdata,0)){
-               DEBUG(0,("spoolss_io_r_open_printer_ex: unable to marshall SPOOL_R_OPEN_PRINTER_EX.\n"));
-               return False;
-       }
+/********************************************************************
+ * api_spoolss_open_printer_ex
+ ********************************************************************/
 
-       return True;
+static bool api_spoolss_open_printer_ex(pipes_struct *p)
+{
+       return proxy_spoolss_call(p, NDR_SPOOLSS_OPENPRINTEREX);
 }
 
 /********************************************************************
@@ -93,7 +72,7 @@ static BOOL api_spoolss_open_printer_ex(pipes_struct *p)
  * called from the spoolss dispatcher
  ********************************************************************/
 
-static BOOL api_spoolss_getprinterdata(pipes_struct *p)
+static bool api_spoolss_getprinterdata(pipes_struct *p)
 {
        SPOOL_Q_GETPRINTERDATA q_u;
        SPOOL_R_GETPRINTERDATA r_u;
@@ -125,30 +104,9 @@ static BOOL api_spoolss_getprinterdata(pipes_struct *p)
  * called from the spoolss dispatcher
  ********************************************************************/
 
-static BOOL api_spoolss_deleteprinterdata(pipes_struct *p)
+static bool api_spoolss_deleteprinterdata(pipes_struct *p)
 {
-       SPOOL_Q_DELETEPRINTERDATA q_u;
-       SPOOL_R_DELETEPRINTERDATA r_u;
-       prs_struct *data = &p->in_data.data;
-       prs_struct *rdata = &p->out_data.rdata;
-
-       ZERO_STRUCT(q_u);
-       ZERO_STRUCT(r_u);
-
-       /* read the stream and fill the struct */
-       if (!spoolss_io_q_deleteprinterdata("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_deleteprinterdata: unable to unmarshall SPOOL_Q_DELETEPRINTERDATA.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_deleteprinterdata( p, &q_u, &r_u);
-
-       if (!spoolss_io_r_deleteprinterdata("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_deleteprinterdata: unable to marshall SPOOL_R_DELETEPRINTERDATA.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_DELETEPRINTERDATA);
 }
 
 /********************************************************************
@@ -157,29 +115,9 @@ static BOOL api_spoolss_deleteprinterdata(pipes_struct *p)
  * called from the spoolss dispatcher
  ********************************************************************/
 
-static BOOL api_spoolss_closeprinter(pipes_struct *p)
+static bool api_spoolss_closeprinter(pipes_struct *p)
 {
-       SPOOL_Q_CLOSEPRINTER q_u;
-       SPOOL_R_CLOSEPRINTER 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_closeprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_closeprinter: unable to unmarshall SPOOL_Q_CLOSEPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_closeprinter(p, &q_u, &r_u);
-
-       if (!spoolss_io_r_closeprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_closeprinter: unable to marshall SPOOL_R_CLOSEPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_CLOSEPRINTER);
 }
 
 /********************************************************************
@@ -188,29 +126,9 @@ static BOOL api_spoolss_closeprinter(pipes_struct *p)
  * called from the spoolss dispatcher
  ********************************************************************/
 
-static BOOL api_spoolss_abortprinter(pipes_struct *p)
+static bool api_spoolss_abortprinter(pipes_struct *p)
 {
-       SPOOL_Q_ABORTPRINTER q_u;
-       SPOOL_R_ABORTPRINTER 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_abortprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_abortprinter: unable to unmarshall SPOOL_Q_ABORTPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_abortprinter(p, &q_u, &r_u);
-
-       if (!spoolss_io_r_abortprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_abortprinter: unable to marshall SPOOL_R_ABORTPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_ABORTPRINTER);
 }
 
 /********************************************************************
@@ -219,61 +137,20 @@ static BOOL api_spoolss_abortprinter(pipes_struct *p)
  * called from the spoolss dispatcher
  ********************************************************************/
 
-static BOOL api_spoolss_deleteprinter(pipes_struct *p)
+static bool api_spoolss_deleteprinter(pipes_struct *p)
 {
-       SPOOL_Q_DELETEPRINTER q_u;
-       SPOOL_R_DELETEPRINTER 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_deleteprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_deleteprinter: unable to unmarshall SPOOL_Q_DELETEPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_deleteprinter(p, &q_u, &r_u);
-
-       if (!spoolss_io_r_deleteprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_deleteprinter: unable to marshall SPOOL_R_DELETEPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_DELETEPRINTER);
 }
 
-
 /********************************************************************
  * api_spoolss_deleteprinterdriver
  *
  * called from the spoolss dispatcher
  ********************************************************************/
 
-static BOOL api_spoolss_deleteprinterdriver(pipes_struct *p)
+static bool api_spoolss_deleteprinterdriver(pipes_struct *p)
 {
-       SPOOL_Q_DELETEPRINTERDRIVER q_u;
-       SPOOL_R_DELETEPRINTERDRIVER 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_deleteprinterdriver("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_deleteprinterdriver: unable to unmarshall SPOOL_Q_DELETEPRINTERDRIVER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_deleteprinterdriver(p, &q_u, &r_u);
-
-       if (!spoolss_io_r_deleteprinterdriver("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_deleteprinter: unable to marshall SPOOL_R_DELETEPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_DELETEPRINTERDRIVER);
 }
 
 
@@ -282,7 +159,7 @@ static BOOL api_spoolss_deleteprinterdriver(pipes_struct *p)
  * ReplyFindFirstPrinterChangeNotifyEx
  ********************************************************************/
 
-static BOOL api_spoolss_rffpcnex(pipes_struct *p)
+static bool api_spoolss_rffpcnex(pipes_struct *p)
 {
        SPOOL_Q_RFFPCNEX q_u;
        SPOOL_R_RFFPCNEX r_u;
@@ -319,7 +196,7 @@ static BOOL api_spoolss_rffpcnex(pipes_struct *p)
  * JRA.
  ********************************************************************/
 
-static BOOL api_spoolss_rfnpcnex(pipes_struct *p)
+static bool api_spoolss_rfnpcnex(pipes_struct *p)
 {
        SPOOL_Q_RFNPCNEX q_u;
        SPOOL_R_RFNPCNEX r_u;
@@ -354,7 +231,7 @@ static BOOL api_spoolss_rfnpcnex(pipes_struct *p)
  *
  ********************************************************************/
 
-static BOOL api_spoolss_enumprinters(pipes_struct *p)
+static bool api_spoolss_enumprinters(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTERS q_u;
        SPOOL_R_ENUMPRINTERS r_u;
@@ -385,7 +262,7 @@ static BOOL api_spoolss_enumprinters(pipes_struct *p)
  *
  ********************************************************************/
 
-static BOOL api_spoolss_getprinter(pipes_struct *p)
+static bool api_spoolss_getprinter(pipes_struct *p)
 {
        SPOOL_Q_GETPRINTER q_u;
        SPOOL_R_GETPRINTER r_u;
@@ -416,7 +293,7 @@ static BOOL api_spoolss_getprinter(pipes_struct *p)
  *
  ********************************************************************/
 
-static BOOL api_spoolss_getprinterdriver2(pipes_struct *p)
+static bool api_spoolss_getprinterdriver2(pipes_struct *p)
 {
        SPOOL_Q_GETPRINTERDRIVER2 q_u;
        SPOOL_R_GETPRINTERDRIVER2 r_u;
@@ -447,29 +324,9 @@ static BOOL api_spoolss_getprinterdriver2(pipes_struct *p)
  *
  ********************************************************************/
 
-static BOOL api_spoolss_startpageprinter(pipes_struct *p)
+static bool api_spoolss_startpageprinter(pipes_struct *p)
 {
-       SPOOL_Q_STARTPAGEPRINTER q_u;
-       SPOOL_R_STARTPAGEPRINTER 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_startpageprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_startpageprinter: unable to unmarshall SPOOL_Q_STARTPAGEPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_startpageprinter(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_startpageprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_startpageprinter: unable to marshall SPOOL_R_STARTPAGEPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_STARTPAGEPRINTER);
 }
 
 /********************************************************************
@@ -478,120 +335,40 @@ static BOOL api_spoolss_startpageprinter(pipes_struct *p)
  *
  ********************************************************************/
 
-static BOOL api_spoolss_endpageprinter(pipes_struct *p)
+static bool api_spoolss_endpageprinter(pipes_struct *p)
 {
-       SPOOL_Q_ENDPAGEPRINTER q_u;
-       SPOOL_R_ENDPAGEPRINTER 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_endpageprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_endpageprinter: unable to unmarshall SPOOL_Q_ENDPAGEPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_endpageprinter(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_endpageprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_endpageprinter: unable to marshall SPOOL_R_ENDPAGEPRINTER.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_ENDPAGEPRINTER);
 }
 
 /********************************************************************
 ********************************************************************/
 
-static BOOL api_spoolss_startdocprinter(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);
 }
 
 /********************************************************************
 ********************************************************************/
 
-static BOOL api_spoolss_enddocprinter(pipes_struct *p)
+static bool api_spoolss_enddocprinter(pipes_struct *p)
 {
-       SPOOL_Q_ENDDOCPRINTER q_u;
-       SPOOL_R_ENDDOCPRINTER 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_enddocprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_enddocprinter: unable to unmarshall SPOOL_Q_ENDDOCPRINTER.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_enddocprinter(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_enddocprinter("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_enddocprinter: unable to marshall SPOOL_R_ENDDOCPRINTER.\n"));
-               return False;
-       }
-
-       return True;            
+       return proxy_spoolss_call(p, NDR_SPOOLSS_ENDDOCPRINTER);
 }
 
 /********************************************************************
 ********************************************************************/
 
-static BOOL api_spoolss_writeprinter(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);
 }
 
 /****************************************************************************
 
 ****************************************************************************/
 
-static BOOL api_spoolss_setprinter(pipes_struct *p)
+static bool api_spoolss_setprinter(pipes_struct *p)
 {
        SPOOL_Q_SETPRINTER q_u;
        SPOOL_R_SETPRINTER r_u;
@@ -619,63 +396,23 @@ static BOOL api_spoolss_setprinter(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_fcpn(pipes_struct *p)
+static bool api_spoolss_fcpn(pipes_struct *p)
 {
-       SPOOL_Q_FCPN q_u;
-       SPOOL_R_FCPN 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_fcpn("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_fcpn: unable to unmarshall SPOOL_Q_FCPN.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_fcpn(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_fcpn("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_fcpn: unable to marshall SPOOL_R_FCPN.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_FINDCLOSEPRINTERNOTIFY);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_addjob(pipes_struct *p)
+static bool api_spoolss_addjob(pipes_struct *p)
 {
-       SPOOL_Q_ADDJOB q_u;
-       SPOOL_R_ADDJOB 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_addjob("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_addjob: unable to unmarshall SPOOL_Q_ADDJOB.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_addjob(p, &q_u, &r_u);
-               
-       if(!spoolss_io_r_addjob("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_addjob: unable to marshall SPOOL_R_ADDJOB.\n"));
-               return False;
-       }
-
-       return True;            
+       return proxy_spoolss_call(p, NDR_SPOOLSS_ADDJOB);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumjobs(pipes_struct *p)
+static bool api_spoolss_enumjobs(pipes_struct *p)
 {
        SPOOL_Q_ENUMJOBS q_u;
        SPOOL_R_ENUMJOBS r_u;
@@ -703,63 +440,23 @@ static BOOL api_spoolss_enumjobs(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_schedulejob(pipes_struct *p)
+static bool api_spoolss_schedulejob(pipes_struct *p)
 {
-       SPOOL_Q_SCHEDULEJOB q_u;
-       SPOOL_R_SCHEDULEJOB 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_schedulejob("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_schedulejob: unable to unmarshall SPOOL_Q_SCHEDULEJOB.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_schedulejob(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_schedulejob("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_schedulejob: unable to marshall SPOOL_R_SCHEDULEJOB.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_SCHEDULEJOB);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_setjob(pipes_struct *p)
+static bool api_spoolss_setjob(pipes_struct *p)
 {
-       SPOOL_Q_SETJOB q_u;
-       SPOOL_R_SETJOB 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_setjob("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_setjob: unable to unmarshall SPOOL_Q_SETJOB.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_setjob(p, &q_u, &r_u);
-
-       if(!spoolss_io_r_setjob("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_setjob: unable to marshall SPOOL_R_SETJOB.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_SETJOB);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p)
+static bool api_spoolss_enumprinterdrivers(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTERDRIVERS q_u;
        SPOOL_R_ENUMPRINTERDRIVERS r_u;
@@ -787,35 +484,15 @@ static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_getform(pipes_struct *p)
+static bool api_spoolss_getform(pipes_struct *p)
 {
-       SPOOL_Q_GETFORM q_u;
-       SPOOL_R_GETFORM 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_getform("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_getform: unable to unmarshall SPOOL_Q_GETFORM.\n"));
-               return False;
-       }
-
-       r_u.status = _spoolss_getform(p, &q_u, &r_u);
-
-       if (!spoolss_io_r_getform("",&r_u,rdata,0)) {
-               DEBUG(0,("spoolss_io_r_getform: unable to marshall SPOOL_R_GETFORM.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_GETFORM);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumforms(pipes_struct *p)
+static bool api_spoolss_enumforms(pipes_struct *p)
 {
        SPOOL_Q_ENUMFORMS q_u;
        SPOOL_R_ENUMFORMS r_u;
@@ -843,7 +520,7 @@ static BOOL api_spoolss_enumforms(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumports(pipes_struct *p)
+static bool api_spoolss_enumports(pipes_struct *p)
 {
        SPOOL_Q_ENUMPORTS q_u;
        SPOOL_R_ENUMPORTS r_u;
@@ -871,35 +548,15 @@ static BOOL api_spoolss_enumports(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_addprinterex(pipes_struct *p)
+static bool api_spoolss_addprinterex(pipes_struct *p)
 {
-       SPOOL_Q_ADDPRINTEREX q_u;
-       SPOOL_R_ADDPRINTEREX 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_addprinterex("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_addprinterex: unable to unmarshall SPOOL_Q_ADDPRINTEREX.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_addprinterex(p, &q_u, &r_u);
-                               
-       if(!spoolss_io_r_addprinterex("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_addprinterex: unable to marshall SPOOL_R_ADDPRINTEREX.\n"));
-               return False;
-       }
-       
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_ADDPRINTEREX);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_addprinterdriver(pipes_struct *p)
+static bool api_spoolss_addprinterdriver(pipes_struct *p)
 {
        SPOOL_Q_ADDPRINTERDRIVER q_u;
        SPOOL_R_ADDPRINTERDRIVER r_u;
@@ -910,6 +567,15 @@ static BOOL api_spoolss_addprinterdriver(pipes_struct *p)
        ZERO_STRUCT(r_u);
        
        if(!spoolss_io_q_addprinterdriver("", &q_u, data, 0)) {
+               if (q_u.level != 3 && q_u.level != 6) {
+                       /* Clever hack from Martin Zielinski <mz@seh.de>
+                        * to allow downgrade from level 8 (Vista).
+                        */
+                       DEBUG(3,("api_spoolss_addprinterdriver: unknown SPOOL_Q_ADDPRINTERDRIVER level %u.\n",
+                               (unsigned int)q_u.level ));
+                       setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG));
+                       return True;
+               }
                DEBUG(0,("spoolss_io_q_addprinterdriver: unable to unmarshall SPOOL_Q_ADDPRINTERDRIVER.\n"));
                return False;
        }
@@ -927,7 +593,7 @@ static BOOL api_spoolss_addprinterdriver(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_getprinterdriverdirectory(pipes_struct *p)
+static bool api_spoolss_getprinterdriverdirectory(pipes_struct *p)
 {
        SPOOL_Q_GETPRINTERDRIVERDIR q_u;
        SPOOL_R_GETPRINTERDRIVERDIR r_u;
@@ -955,7 +621,7 @@ static BOOL api_spoolss_getprinterdriverdirectory(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprinterdata(pipes_struct *p)
+static bool api_spoolss_enumprinterdata(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTERDATA q_u;
        SPOOL_R_ENUMPRINTERDATA r_u;
@@ -983,7 +649,7 @@ static BOOL api_spoolss_enumprinterdata(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_setprinterdata(pipes_struct *p)
+static bool api_spoolss_setprinterdata(pipes_struct *p)
 {
        SPOOL_Q_SETPRINTERDATA q_u;
        SPOOL_R_SETPRINTERDATA r_u;
@@ -1010,7 +676,7 @@ static BOOL api_spoolss_setprinterdata(pipes_struct *p)
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_reset_printer(pipes_struct *p)
+static bool api_spoolss_reset_printer(pipes_struct *p)
 {
        SPOOL_Q_RESETPRINTER q_u;
        SPOOL_R_RESETPRINTER r_u;
@@ -1037,91 +703,31 @@ static BOOL api_spoolss_reset_printer(pipes_struct *p)
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_addform(pipes_struct *p)
+static bool api_spoolss_addform(pipes_struct *p)
 {
-       SPOOL_Q_ADDFORM q_u;
-       SPOOL_R_ADDFORM 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_addform("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_addform: unable to unmarshall SPOOL_Q_ADDFORM.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_addform(p, &q_u, &r_u);
-       
-       if(!spoolss_io_r_addform("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_addform: unable to marshall SPOOL_R_ADDFORM.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_ADDFORM);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_deleteform(pipes_struct *p)
+static bool api_spoolss_deleteform(pipes_struct *p)
 {
-       SPOOL_Q_DELETEFORM q_u;
-       SPOOL_R_DELETEFORM 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_deleteform("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_deleteform: unable to unmarshall SPOOL_Q_DELETEFORM.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_deleteform(p, &q_u, &r_u);
-       
-       if(!spoolss_io_r_deleteform("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_deleteform: unable to marshall SPOOL_R_DELETEFORM.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_DELETEFORM);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_setform(pipes_struct *p)
+static bool api_spoolss_setform(pipes_struct *p)
 {
-       SPOOL_Q_SETFORM q_u;
-       SPOOL_R_SETFORM 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_setform("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_setform: unable to unmarshall SPOOL_Q_SETFORM.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_setform(p, &q_u, &r_u);
-                                     
-       if(!spoolss_io_r_setform("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_setform: unable to marshall SPOOL_R_SETFORM.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_SETFORM);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprintprocessors(pipes_struct *p)
+static bool api_spoolss_enumprintprocessors(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTPROCESSORS q_u;
        SPOOL_R_ENUMPRINTPROCESSORS r_u;
@@ -1149,39 +755,15 @@ static BOOL api_spoolss_enumprintprocessors(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_addprintprocessor(pipes_struct *p)
+static bool api_spoolss_addprintprocessor(pipes_struct *p)
 {
-       SPOOL_Q_ADDPRINTPROCESSOR q_u;
-       SPOOL_R_ADDPRINTPROCESSOR 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_addprintprocessor("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_addprintprocessor: unable to unmarshall SPOOL_Q_ADDPRINTPROCESSOR.\n"));
-               return False;
-       }
-       
-       /* for now, just indicate success and ignore the add.  We'll
-          automatically set the winprint processor for printer
-          entries later.  Used to debug the LexMark Optra S 1855 PCL
-          driver --jerry */
-       r_u.status = WERR_OK;
-
-       if(!spoolss_io_r_addprintprocessor("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_addprintprocessor: unable to marshall SPOOL_R_ADDPRINTPROCESSOR.\n"));
-               return False;
-       }
-       
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_ADDPRINTPROCESSOR);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprintprocdatatypes(pipes_struct *p)
+static bool api_spoolss_enumprintprocdatatypes(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTPROCDATATYPES q_u;
        SPOOL_R_ENUMPRINTPROCDATATYPES r_u;
@@ -1209,7 +791,7 @@ static BOOL api_spoolss_enumprintprocdatatypes(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprintmonitors(pipes_struct *p)
+static bool api_spoolss_enumprintmonitors(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTMONITORS q_u;
        SPOOL_R_ENUMPRINTMONITORS r_u;
@@ -1237,13 +819,16 @@ static BOOL api_spoolss_enumprintmonitors(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_getjob(pipes_struct *p)
+static bool api_spoolss_getjob(pipes_struct *p)
 {
        SPOOL_Q_GETJOB q_u;
        SPOOL_R_GETJOB 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_getjob("", &q_u, data, 0)) {
                DEBUG(0,("spoolss_io_q_getjob: unable to unmarshall SPOOL_Q_GETJOB.\n"));
                return False;
@@ -1265,65 +850,24 @@ static BOOL api_spoolss_getjob(pipes_struct *p)
  * called from the spoolss dispatcher
  ********************************************************************/
 
-static BOOL api_spoolss_getprinterdataex(pipes_struct *p)
+static bool api_spoolss_getprinterdataex(pipes_struct *p)
 {
-       SPOOL_Q_GETPRINTERDATAEX q_u;
-       SPOOL_R_GETPRINTERDATAEX r_u;
-       prs_struct *data = &p->in_data.data;
-       prs_struct *rdata = &p->out_data.rdata;
-
-       ZERO_STRUCT(q_u);
-       ZERO_STRUCT(r_u);
-
-       /* read the stream and fill the struct */
-       if (!spoolss_io_q_getprinterdataex("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_getprinterdataex: unable to unmarshall SPOOL_Q_GETPRINTERDATAEX.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_getprinterdataex( p, &q_u, &r_u);
-
-       if (!spoolss_io_r_getprinterdataex("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_getprinterdataex: unable to marshall SPOOL_R_GETPRINTERDATAEX.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_GETPRINTERDATAEX);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_setprinterdataex(pipes_struct *p)
+static bool api_spoolss_setprinterdataex(pipes_struct *p)
 {
-       SPOOL_Q_SETPRINTERDATAEX q_u;
-       SPOOL_R_SETPRINTERDATAEX 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_setprinterdataex("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_setprinterdataex: unable to unmarshall SPOOL_Q_SETPRINTERDATAEX.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_setprinterdataex(p, &q_u, &r_u);
-                               
-       if(!spoolss_io_r_setprinterdataex("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_setprinterdataex: unable to marshall SPOOL_R_SETPRINTERDATAEX.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_SETPRINTERDATAEX);
 }
 
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprinterkey(pipes_struct *p)
+static bool api_spoolss_enumprinterkey(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTERKEY q_u;
        SPOOL_R_ENUMPRINTERKEY r_u;
@@ -1351,7 +895,7 @@ static BOOL api_spoolss_enumprinterkey(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprinterdataex(pipes_struct *p)
+static bool api_spoolss_enumprinterdataex(pipes_struct *p)
 {
        SPOOL_Q_ENUMPRINTERDATAEX q_u;
        SPOOL_R_ENUMPRINTERDATAEX r_u;
@@ -1379,7 +923,7 @@ static BOOL api_spoolss_enumprinterdataex(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_getprintprocessordirectory(pipes_struct *p)
+static bool api_spoolss_getprintprocessordirectory(pipes_struct *p)
 {
        SPOOL_Q_GETPRINTPROCESSORDIRECTORY q_u;
        SPOOL_R_GETPRINTPROCESSORDIRECTORY r_u;
@@ -1407,63 +951,23 @@ static BOOL api_spoolss_getprintprocessordirectory(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_deleteprinterdataex(pipes_struct *p)
+static bool api_spoolss_deleteprinterdataex(pipes_struct *p)
 {
-       SPOOL_Q_DELETEPRINTERDATAEX q_u;
-       SPOOL_R_DELETEPRINTERDATAEX 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_deleteprinterdataex("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_deleteprinterdataex: unable to unmarshall SPOOL_Q_DELETEPRINTERDATAEX.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_deleteprinterdataex(p, &q_u, &r_u);
-                               
-       if(!spoolss_io_r_deleteprinterdataex("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_deleteprinterdataex: unable to marshall SPOOL_R_DELETEPRINTERDATAEX.\n"));
-               return False;
-       }
-       
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_DELETEPRINTERDATAEX);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_deleteprinterkey(pipes_struct *p)
+static bool api_spoolss_deleteprinterkey(pipes_struct *p)
 {
-       SPOOL_Q_DELETEPRINTERKEY q_u;
-       SPOOL_R_DELETEPRINTERKEY 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_deleteprinterkey("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_deleteprinterkey: unable to unmarshall SPOOL_Q_DELETEPRINTERKEY.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_deleteprinterkey(p, &q_u, &r_u);
-                               
-       if(!spoolss_io_r_deleteprinterkey("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_deleteprinterkey: unable to marshall SPOOL_R_DELETEPRINTERKEY.\n"));
-               return False;
-       }
-       
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_DELETEPRINTERKEY);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_addprinterdriverex(pipes_struct *p)
+static bool api_spoolss_addprinterdriverex(pipes_struct *p)
 {
        SPOOL_Q_ADDPRINTERDRIVEREX q_u;
        SPOOL_R_ADDPRINTERDRIVEREX r_u;
@@ -1474,6 +978,15 @@ static BOOL api_spoolss_addprinterdriverex(pipes_struct *p)
        ZERO_STRUCT(r_u);
        
        if(!spoolss_io_q_addprinterdriverex("", &q_u, data, 0)) {
+               if (q_u.level != 3 && q_u.level != 6) {
+                       /* Clever hack from Martin Zielinski <mz@seh.de>
+                        * to allow downgrade from level 8 (Vista).
+                        */
+                       DEBUG(3,("api_spoolss_addprinterdriverex: unknown SPOOL_Q_ADDPRINTERDRIVEREX level %u.\n",
+                               (unsigned int)q_u.level ));
+                       setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG));
+                       return True;
+               }
                DEBUG(0,("spoolss_io_q_addprinterdriverex: unable to unmarshall SPOOL_Q_ADDPRINTERDRIVEREX.\n"));
                return False;
        }
@@ -1491,91 +1004,39 @@ static BOOL api_spoolss_addprinterdriverex(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_deleteprinterdriverex(pipes_struct *p)
-{
-       SPOOL_Q_DELETEPRINTERDRIVEREX q_u;
-       SPOOL_R_DELETEPRINTERDRIVEREX 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_deleteprinterdriverex("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_deleteprinterdriverex: unable to unmarshall SPOOL_Q_DELETEPRINTERDRIVEREX.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_deleteprinterdriverex(p, &q_u, &r_u);
-                               
-       if(!spoolss_io_r_deleteprinterdriverex("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_deleteprinterdriverex: unable to marshall SPOOL_R_DELETEPRINTERDRIVEREX.\n"));
-               return False;
-       }
-       
-       return True;
-}
-
-#if 0
-
-/****************************************************************************
-****************************************************************************/
-
-static BOOL api_spoolss_replyopenprinter(pipes_struct *p)
+static bool api_spoolss_deleteprinterdriverex(pipes_struct *p)
 {
-       SPOOL_Q_REPLYOPENPRINTER q_u;
-       SPOOL_R_REPLYOPENPRINTER 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_replyopenprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_replyopenprinter: unable to unmarshall SPOOL_Q_REPLYOPENPRINTER.\n"));
-               return False;
-       }
-       
-       r_u.status = _spoolss_replyopenprinter(p, &q_u, &r_u);
-                               
-       if(!spoolss_io_r_replyopenprinter("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_replyopenprinter: unable to marshall SPOOL_R_REPLYOPENPRINTER.\n"));
-               return False;
-       }
-       
-       return True;
+       return proxy_spoolss_call(p, NDR_SPOOLSS_DELETEPRINTERDRIVEREX);
 }
 
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_replycloseprinter(pipes_struct *p)
+static bool api_spoolss_xcvdataport(pipes_struct *p)
 {
-       SPOOL_Q_REPLYCLOSEPRINTER q_u;
-       SPOOL_R_REPLYCLOSEPRINTER r_u;
+       SPOOL_Q_XCVDATAPORT q_u;
+       SPOOL_R_XCVDATAPORT 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_replycloseprinter("", &q_u, data, 0)) {
-               DEBUG(0,("spoolss_io_q_replycloseprinter: unable to unmarshall SPOOL_Q_REPLYCLOSEPRINTER.\n"));
+       if(!spoolss_io_q_xcvdataport("", &q_u, data, 0)) {
+               DEBUG(0,("spoolss_io_q_replyopenprinter: unable to unmarshall SPOOL_Q_XCVDATAPORT.\n"));
                return False;
        }
        
-       r_u.status = _spoolss_replycloseprinter(p, &q_u, &r_u);
+       r_u.status = _spoolss_xcvdataport(p, &q_u, &r_u);
                                
-       if(!spoolss_io_r_replycloseprinter("", &r_u, rdata, 0)) {
-               DEBUG(0,("spoolss_io_r_replycloseprinter: unable to marshall SPOOL_R_REPLYCLOSEPRINTER.\n"));
+       if(!spoolss_io_r_xcvdataport("", &r_u, rdata, 0)) {
+               DEBUG(0,("spoolss_io_r_replyopenprinter: unable to marshall SPOOL_R_XCVDATAPORT.\n"));
                return False;
        }
        
        return True;
 }
 
-#endif
-
 /*******************************************************************
 \pipe\spoolss commands
 ********************************************************************/
@@ -1633,20 +1094,20 @@ static BOOL api_spoolss_replycloseprinter(pipes_struct *p)
  {"SPOOLSS_GETPRINTPROCESSORDIRECTORY",SPOOLSS_GETPRINTPROCESSORDIRECTORY,api_spoolss_getprintprocessordirectory},
  {"SPOOLSS_ADDPRINTERDRIVEREX",        SPOOLSS_ADDPRINTERDRIVEREX,        api_spoolss_addprinterdriverex        },
  {"SPOOLSS_DELETEPRINTERDRIVEREX",     SPOOLSS_DELETEPRINTERDRIVEREX,     api_spoolss_deleteprinterdriverex     },
-#if 0
- {"SPOOLSS_REPLYOPENPRINTER",          SPOOLSS_REPLYOPENPRINTER,          api_spoolss_replyopenprinter          },
- {"SPOOLSS_REPLYCLOSEPRINTER",         SPOOLSS_REPLYCLOSEPRINTER,         api_spoolss_replycloseprinter         }
-#endif
-    };
+ {"SPOOLSS_XCVDATAPORT",               SPOOLSS_XCVDATAPORT,               api_spoolss_xcvdataport               },
+};
 
-void spoolss_get_pipe_fns( struct api_struct **fns, int *n_fns )
+void spoolss2_get_pipe_fns( struct api_struct **fns, int *n_fns )
 {
        *fns = api_spoolss_cmds;
        *n_fns = sizeof(api_spoolss_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_spoolss_init(void)
+NTSTATUS rpc_spoolss2_init(void)
 {
-  return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "spoolss", "spoolss", api_spoolss_cmds,
-                                   sizeof(api_spoolss_cmds) / sizeof(struct api_struct));
+       return rpc_srv_register(
+               SMB_RPC_INTERFACE_VERSION, "spoolss", "spoolss",
+               &ndr_table_spoolss,
+               api_spoolss_cmds,
+               sizeof(api_spoolss_cmds) / sizeof(struct api_struct));
 }