s3-samr: avoid code duplication for identical code in _samr_Connect2, 4 and 5.
[kai/samba.git] / source3 / rpc_server / srv_spoolss.c
old mode 100755 (executable)
new mode 100644 (file)
index eed24bf..22b3a76
@@ -1,15 +1,16 @@
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-2000,
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
- *  Copyright (C) Jean François Micouleau      1998-2000.
- *  Copyright (C) Jeremy Allison                                       2001.
+ *  Copyright (C) Jean François Micouleau      1998-2000,
+ *  Copyright (C) Jeremy Allison                    2001,
+ *  Copyright (C) Gerald Carter                2001-2002,
+ *  Copyright (C) Jim McDonough <jmcd@us.ibm.com>   2003.
  *  
  *  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,
  *  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"
 
-extern int DEBUGLEVEL;
+#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)
+{
+       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;
+
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       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;
+       }
+
+       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;
+       }
+
+       return True;
+}
+
 
 /********************************************************************
  * api_spoolss_open_printer_ex
  ********************************************************************/
 
-static BOOL api_spoolss_open_printer_ex(pipes_struct *p)
+static bool api_spoolss_open_printer_ex(pipes_struct *p)
 {
        SPOOL_Q_OPEN_PRINTER_EX q_u;
        SPOOL_R_OPEN_PRINTER_EX r_u;
@@ -61,7 +92,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;
@@ -93,7 +124,7 @@ 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;
@@ -109,7 +140,7 @@ static BOOL api_spoolss_deleteprinterdata(pipes_struct *p)
                return False;
        }
        
-       r_u.status = _spoolss_deleteprinterdata( p, &q_u, &r_u);
+       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"));
@@ -125,7 +156,7 @@ 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;
@@ -156,7 +187,7 @@ 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;
@@ -187,7 +218,7 @@ 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;
@@ -219,7 +250,7 @@ static BOOL api_spoolss_deleteprinter(pipes_struct *p)
  * 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;
@@ -250,7 +281,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;
@@ -287,7 +318,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;
@@ -305,12 +336,12 @@ static BOOL api_spoolss_rfnpcnex(pipes_struct *p)
        r_u.status = _spoolss_rfnpcnex(p, &q_u, &r_u);
 
        if (!spoolss_io_r_rfnpcnex("", &r_u, rdata, 0)) {
-               safe_free(r_u.info.data);
+               SAFE_FREE(r_u.info.data);
                DEBUG(0,("spoolss_io_r_rfnpcnex: unable to marshall SPOOL_R_RFNPCNEX.\n"));
                return False;
        }
 
-       safe_free(r_u.info.data);
+       SAFE_FREE(r_u.info.data);
 
        return True;
 }
@@ -322,7 +353,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;
@@ -353,7 +384,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;
@@ -384,7 +415,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;
@@ -415,7 +446,7 @@ 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;
@@ -446,7 +477,7 @@ 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;
@@ -474,7 +505,7 @@ static BOOL api_spoolss_endpageprinter(pipes_struct *p)
 /********************************************************************
 ********************************************************************/
 
-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;
@@ -502,7 +533,7 @@ static BOOL api_spoolss_startdocprinter(pipes_struct *p)
 /********************************************************************
 ********************************************************************/
 
-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;
@@ -530,7 +561,7 @@ static BOOL api_spoolss_enddocprinter(pipes_struct *p)
 /********************************************************************
 ********************************************************************/
 
-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;
@@ -559,7 +590,7 @@ static BOOL api_spoolss_writeprinter(pipes_struct *p)
 
 ****************************************************************************/
 
-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;
@@ -587,7 +618,7 @@ 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;
@@ -615,7 +646,7 @@ static BOOL api_spoolss_fcpn(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -643,7 +674,7 @@ static BOOL api_spoolss_addjob(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -671,7 +702,7 @@ 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;
@@ -699,7 +730,7 @@ static BOOL api_spoolss_schedulejob(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -727,7 +758,7 @@ static BOOL api_spoolss_setjob(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -755,7 +786,7 @@ 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;
@@ -783,7 +814,7 @@ static BOOL api_spoolss_getform(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -811,7 +842,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;
@@ -839,7 +870,7 @@ 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;
@@ -867,7 +898,7 @@ static BOOL api_spoolss_addprinterex(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -878,6 +909,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;
        }
@@ -895,7 +935,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;
@@ -923,7 +963,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;
@@ -951,7 +991,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;
@@ -978,8 +1018,34 @@ static BOOL api_spoolss_setprinterdata(pipes_struct *p)
 
 /****************************************************************************
 ****************************************************************************/
+static bool api_spoolss_reset_printer(pipes_struct *p)
+{
+       SPOOL_Q_RESETPRINTER q_u;
+       SPOOL_R_RESETPRINTER 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_resetprinter("", &q_u, data, 0)) {
+               DEBUG(0,("spoolss_io_q_setprinterdata: unable to unmarshall SPOOL_Q_SETPRINTERDATA.\n"));
+               return False;
+       }
+       
+       r_u.status = _spoolss_resetprinter(p, &q_u, &r_u);
 
-static BOOL api_spoolss_addform(pipes_struct *p)
+       if(!spoolss_io_r_resetprinter("", &r_u, rdata, 0)) {
+               DEBUG(0,("spoolss_io_r_setprinterdata: unable to marshall SPOOL_R_RESETPRINTER.\n"));
+               return False;
+       }
+
+       return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+static bool api_spoolss_addform(pipes_struct *p)
 {
        SPOOL_Q_ADDFORM q_u;
        SPOOL_R_ADDFORM r_u;
@@ -1007,7 +1073,7 @@ static BOOL api_spoolss_addform(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -1035,7 +1101,7 @@ static BOOL api_spoolss_deleteform(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -1063,7 +1129,7 @@ static BOOL api_spoolss_setform(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -1091,7 +1157,7 @@ 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;
@@ -1123,7 +1189,7 @@ static BOOL api_spoolss_addprintprocessor(pipes_struct *p)
 /****************************************************************************
 ****************************************************************************/
 
-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;
@@ -1151,7 +1217,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;
@@ -1179,13 +1245,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;
@@ -1201,12 +1270,307 @@ static BOOL api_spoolss_getjob(pipes_struct *p)
        return True;
 }
 
+/********************************************************************
+ * api_spoolss_getprinterdataex
+ *
+ * called from the spoolss dispatcher
+ ********************************************************************/
+
+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;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+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;
+}
+
+
+/****************************************************************************
+****************************************************************************/
+
+static bool api_spoolss_enumprinterkey(pipes_struct *p)
+{
+       SPOOL_Q_ENUMPRINTERKEY q_u;
+       SPOOL_R_ENUMPRINTERKEY 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_enumprinterkey("", &q_u, data, 0)) {
+               DEBUG(0,("spoolss_io_q_setprinterkey: unable to unmarshall SPOOL_Q_ENUMPRINTERKEY.\n"));
+               return False;
+       }
+       
+       r_u.status = _spoolss_enumprinterkey(p, &q_u, &r_u);
+                               
+       if(!spoolss_io_r_enumprinterkey("", &r_u, rdata, 0)) {
+               DEBUG(0,("spoolss_io_r_enumprinterkey: unable to marshall SPOOL_R_ENUMPRINTERKEY.\n"));
+               return False;
+       }
+
+       return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static bool api_spoolss_enumprinterdataex(pipes_struct *p)
+{
+       SPOOL_Q_ENUMPRINTERDATAEX q_u;
+       SPOOL_R_ENUMPRINTERDATAEX 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_enumprinterdataex("", &q_u, data, 0)) {
+               DEBUG(0,("spoolss_io_q_enumprinterdataex: unable to unmarshall SPOOL_Q_ENUMPRINTERDATAEX.\n"));
+               return False;
+       }
+       
+       r_u.status = _spoolss_enumprinterdataex(p, &q_u, &r_u);
+                               
+       if(!spoolss_io_r_enumprinterdataex("", &r_u, rdata, 0)) {
+               DEBUG(0,("spoolss_io_r_enumprinterdataex: unable to marshall SPOOL_R_ENUMPRINTERDATAEX.\n"));
+               return False;
+       }
+
+       return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static bool api_spoolss_getprintprocessordirectory(pipes_struct *p)
+{
+       SPOOL_Q_GETPRINTPROCESSORDIRECTORY q_u;
+       SPOOL_R_GETPRINTPROCESSORDIRECTORY 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_getprintprocessordirectory("", &q_u, data, 0)) {
+               DEBUG(0,("spoolss_io_q_getprintprocessordirectory: unable to unmarshall SPOOL_Q_GETPRINTPROCESSORDIRECTORY.\n"));
+               return False;
+       }
+       
+       r_u.status = _spoolss_getprintprocessordirectory(p, &q_u, &r_u);
+                               
+       if(!spoolss_io_r_getprintprocessordirectory("", &r_u, rdata, 0)) {
+               DEBUG(0,("spoolss_io_r_getprintprocessordirectory: unable to marshall SPOOL_R_GETPRINTPROCESSORDIRECTORY.\n"));
+               return False;
+       }
+       
+       return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+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;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+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;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static bool api_spoolss_addprinterdriverex(pipes_struct *p)
+{
+       SPOOL_Q_ADDPRINTERDRIVEREX q_u;
+       SPOOL_R_ADDPRINTERDRIVEREX 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_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;
+       }
+       
+       r_u.status = _spoolss_addprinterdriverex(p, &q_u, &r_u);
+                               
+       if(!spoolss_io_r_addprinterdriverex("", &r_u, rdata, 0)) {
+               DEBUG(0,("spoolss_io_r_addprinterdriverex: unable to marshall SPOOL_R_ADDPRINTERDRIVEREX.\n"));
+               return False;
+       }
+       
+       return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+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;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static bool api_spoolss_xcvdataport(pipes_struct *p)
+{
+       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_xcvdataport("", &q_u, data, 0)) {
+               DEBUG(0,("spoolss_io_q_replyopenprinter: unable to unmarshall SPOOL_Q_XCVDATAPORT.\n"));
+               return False;
+       }
+       
+       r_u.status = _spoolss_xcvdataport(p, &q_u, &r_u);
+                               
+       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;
+}
+
 /*******************************************************************
 \pipe\spoolss commands
 ********************************************************************/
 
-struct api_struct api_spoolss_cmds[] = 
-{
+  struct api_struct api_spoolss_cmds[] = 
+    {
+ {"SPOOLSS_OPENPRINTER",               SPOOLSS_OPENPRINTER,               api_spoolss_open_printer              },
  {"SPOOLSS_OPENPRINTEREX",             SPOOLSS_OPENPRINTEREX,             api_spoolss_open_printer_ex           },
  {"SPOOLSS_GETPRINTERDATA",            SPOOLSS_GETPRINTERDATA,            api_spoolss_getprinterdata            },
  {"SPOOLSS_CLOSEPRINTER",              SPOOLSS_CLOSEPRINTER,              api_spoolss_closeprinter              },
@@ -1237,6 +1601,7 @@ struct api_struct api_spoolss_cmds[] =
  {"SPOOLSS_GETPRINTERDRIVERDIRECTORY", SPOOLSS_GETPRINTERDRIVERDIRECTORY, api_spoolss_getprinterdriverdirectory },
  {"SPOOLSS_ENUMPRINTERDATA",           SPOOLSS_ENUMPRINTERDATA,           api_spoolss_enumprinterdata           },
  {"SPOOLSS_SETPRINTERDATA",            SPOOLSS_SETPRINTERDATA,            api_spoolss_setprinterdata            },
+ {"SPOOLSS_RESETPRINTER",              SPOOLSS_RESETPRINTER,              api_spoolss_reset_printer             },
  {"SPOOLSS_DELETEPRINTERDATA",         SPOOLSS_DELETEPRINTERDATA,         api_spoolss_deleteprinterdata         },
  {"SPOOLSS_ADDFORM",                   SPOOLSS_ADDFORM,                   api_spoolss_addform                   },
  {"SPOOLSS_DELETEFORM",                SPOOLSS_DELETEFORM,                api_spoolss_deleteform                },
@@ -1247,13 +1612,28 @@ struct api_struct api_spoolss_cmds[] =
  {"SPOOLSS_ENUMMONITORS",              SPOOLSS_ENUMMONITORS,              api_spoolss_enumprintmonitors         },
  {"SPOOLSS_GETJOB",                    SPOOLSS_GETJOB,                    api_spoolss_getjob                    },
  {"SPOOLSS_ENUMPRINTPROCDATATYPES",    SPOOLSS_ENUMPRINTPROCDATATYPES,    api_spoolss_enumprintprocdatatypes    },
- { NULL,                               0,                                 NULL                                  }
+ {"SPOOLSS_GETPRINTERDATAEX",          SPOOLSS_GETPRINTERDATAEX,          api_spoolss_getprinterdataex          },
+ {"SPOOLSS_SETPRINTERDATAEX",          SPOOLSS_SETPRINTERDATAEX,          api_spoolss_setprinterdataex          },
+ {"SPOOLSS_DELETEPRINTERDATAEX",       SPOOLSS_DELETEPRINTERDATAEX,       api_spoolss_deleteprinterdataex       },
+ {"SPOOLSS_ENUMPRINTERDATAEX",         SPOOLSS_ENUMPRINTERDATAEX,         api_spoolss_enumprinterdataex         },
+ {"SPOOLSS_ENUMPRINTERKEY",            SPOOLSS_ENUMPRINTERKEY,            api_spoolss_enumprinterkey            },
+ {"SPOOLSS_DELETEPRINTERKEY",          SPOOLSS_DELETEPRINTERKEY,          api_spoolss_deleteprinterkey          },
+ {"SPOOLSS_GETPRINTPROCESSORDIRECTORY",SPOOLSS_GETPRINTPROCESSORDIRECTORY,api_spoolss_getprintprocessordirectory},
+ {"SPOOLSS_ADDPRINTERDRIVEREX",        SPOOLSS_ADDPRINTERDRIVEREX,        api_spoolss_addprinterdriverex        },
+ {"SPOOLSS_DELETEPRINTERDRIVEREX",     SPOOLSS_DELETEPRINTERDRIVEREX,     api_spoolss_deleteprinterdriverex     },
+ {"SPOOLSS_XCVDATAPORT",               SPOOLSS_XCVDATAPORT,               api_spoolss_xcvdataport               },
 };
 
-/*******************************************************************
-receives a spoolss pipe and responds.
-********************************************************************/
-BOOL api_spoolss_rpc(pipes_struct *p)
+void spoolss_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)
 {
-       return api_rpcTNP(p, "api_spoolss_rpc", api_spoolss_cmds);
+  return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION,
+                                   "spoolss", "spoolss", &syntax_spoolss,
+                                   api_spoolss_cmds,
+                                   sizeof(api_spoolss_cmds) / sizeof(struct api_struct));
 }