r23779: Change from v2 or later to v3 or later.
[amitay/samba.git] / source3 / rpc_client / cli_spoolss.c
index 7417e0c0fc6f96ea0f312dc51bc5adca736b30ee..e1cbf9674e172648a090a75658ee8d06cb1c6fca 100644 (file)
 /*
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-2000,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
- *  Copyright (C) Paul Ashton                  1997-2000,
- *  Copyright (C) Jean Francois Micouleau      1998-2000,
- *
- *  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
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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.
- */
+   Unix SMB/CIFS implementation.
+   RPC pipe client
+
+   Copyright (C) Gerald Carter                2001-2005,
+   Copyright (C) Tim Potter                   2000-2002,
+   Copyright (C) Andrew Tridgell              1994-2000,
+   Copyright (C) Jean-Francois Micouleau      1999-2000.
+   Copyright (C) Jeremy Allison                         2005.
+
+   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 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.
+*/
 
 #include "includes.h"
-#include "rpc_parse.h"
 #include "rpc_client.h"
-#include "nterr.h"
 
-extern int DEBUGLEVEL;
+/*********************************************************************
+ Decode various spoolss rpc's and info levels
+ ********************************************************************/
 
-/****************************************************************************
-do a SPOOLSS Enum Printer Drivers
-****************************************************************************/
-uint32 spoolss_enum_printerdrivers(const char *srv_name, const char *environment,
-                                   uint32 level, NEW_BUFFER *buffer, uint32 offered,
-                                   uint32 *needed, uint32 *returned)
-{
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_ENUMPRINTERDRIVERS q_o;
-        SPOOL_R_ENUMPRINTERDRIVERS r_o;
-       TALLOC_CTX *ctx = prs_get_mem_context(&buffer->prs);
+/**********************************************************************
+**********************************************************************/
 
-        struct cli_connection *con = NULL;
+static BOOL decode_printer_info_0(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer,
+                               uint32 returned, PRINTER_INFO_0 **info)
+{
+       uint32 i;
+       PRINTER_INFO_0  *inf;
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, PRINTER_INFO_0, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(PRINTER_INFO_0));
+       } else {
+               inf = NULL;
+       }
 
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+       prs_set_offset(&buffer->prs,0);
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_info_0("", buffer, &inf[i], 0)) {
+                       return False;
+               }
+       }
 
-        DEBUG(5,("SPOOLSS Enum Printer Drivers (Server: %s Environment: %s level: %d)\n",
-                                srv_name, environment, level));
+       *info=inf;
+       return True;
+}
 
-        make_spoolss_q_enumprinterdrivers(&q_o, srv_name, environment,
-                                level, buffer, offered);
+/**********************************************************************
+**********************************************************************/
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_enumprinterdrivers("", &q_o, &buf, 0) ) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+static BOOL decode_printer_info_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer,
+                               uint32 returned, PRINTER_INFO_1 **info)
+{
+       uint32 i;
+       PRINTER_INFO_1  *inf;
 
-                cli_connection_unlink(con);
-        }
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, PRINTER_INFO_1, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(PRINTER_INFO_1));
+       } else {
+               inf = NULL;
+       }
 
-        if(!rpc_con_pipe_req(con, SPOOLSS_ENUMPRINTERDRIVERS, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+       prs_set_offset(&buffer->prs,0);
 
-                cli_connection_unlink(con);
-        }
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_info_1("", buffer, &inf[i], 0)) {
+                       return False;
+               }
+       }
 
-        prs_mem_free(&buf);
-        ZERO_STRUCT(r_o);
+       *info=inf;
+       return True;
+}
 
-        prs_switch_type(&buffer->prs, UNMARSHALL);
-        prs_set_offset(&buffer->prs, 0);
-        r_o.buffer=buffer;
+/**********************************************************************
+**********************************************************************/
 
-        if(!new_spoolss_io_r_enumprinterdrivers("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-                cli_connection_unlink(con);
-        }
+static BOOL decode_printer_info_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                               uint32 returned, PRINTER_INFO_2 **info)
+{
+       uint32 i;
+       PRINTER_INFO_2  *inf;
 
-        *needed=r_o.needed;
-        *returned=r_o.returned;
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, PRINTER_INFO_2, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(PRINTER_INFO_2));
+       } else {
+               inf = NULL;
+       }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       prs_set_offset(&buffer->prs,0);
 
-        cli_connection_unlink(con);
+       for (i=0; i<returned; i++) {
+               /* a little initialization as we go */
+               inf[i].secdesc = NULL;
+               if (!smb_io_printer_info_2("", buffer, &inf[i], 0)) {
+                       return False;
+               }
+       }
 
-        return r_o.status;
+       *info=inf;
+       return True;
 }
 
-/****************************************************************************
-do a SPOOLSS Enum Printers
-****************************************************************************/
-uint32 spoolss_enum_printers(uint32 flags, fstring srv_name, uint32 level,
-                             NEW_BUFFER *buffer, uint32 offered,
-                             uint32 *needed, uint32 *returned)
+/**********************************************************************
+**********************************************************************/
+
+static BOOL decode_printer_info_3(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                               uint32 returned, PRINTER_INFO_3 **info)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_ENUMPRINTERS q_o;
-        SPOOL_R_ENUMPRINTERS r_o;
-       TALLOC_CTX *ctx = prs_get_mem_context(&buffer->prs);
+       uint32 i;
+       PRINTER_INFO_3  *inf;
 
-        struct cli_connection *con = NULL;
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, PRINTER_INFO_3, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(PRINTER_INFO_3));
+       } else {
+               inf = NULL;
+       }
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+       prs_set_offset(&buffer->prs,0);
 
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+       for (i=0; i<returned; i++) {
+               inf[i].secdesc = NULL;
+               if (!smb_io_printer_info_3("", buffer, &inf[i], 0)) {
+                       return False;
+               }
+       }
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
+       *info=inf;
+       return True;
+}
 
-        DEBUG(5,("SPOOLSS Enum Printers (Server: %s level: %d)\n", srv_name, level));
+/**********************************************************************
+**********************************************************************/
 
-        make_spoolss_q_enumprinters(&q_o, flags, "", level, buffer, offered);
+static BOOL decode_printer_info_7(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer,
+                               uint32 returned, PRINTER_INFO_7 **info)
+{
+       uint32 i;
+       PRINTER_INFO_7  *inf;
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_enumprinters("", &q_o, &buf, 0) ) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, PRINTER_INFO_7, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(PRINTER_INFO_7));
+       } else {
+               inf = NULL;
+       }
 
-                cli_connection_unlink(con);
-        }
+       prs_set_offset(&buffer->prs,0);
 
-        if(!rpc_con_pipe_req(con, SPOOLSS_ENUMPRINTERS, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_info_7("", buffer, &inf[i], 0)) {
+                       return False;
+               }
+       }
 
-                cli_connection_unlink(con);
-        }
+       *info=inf;
+       return True;
+}
 
-        prs_mem_free(&buf );
-        ZERO_STRUCT(r_o);
 
-        prs_switch_type(&buffer->prs, UNMARSHALL);
-        prs_set_offset(&buffer->prs, 0);
-        r_o.buffer=buffer;
+/**********************************************************************
+**********************************************************************/
 
-        if(!new_spoolss_io_r_enumprinters("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-                cli_connection_unlink(con);
-        }
+static BOOL decode_port_info_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                       uint32 returned, PORT_INFO_1 **info)
+{
+       uint32 i;
+       PORT_INFO_1 *inf;
 
-        *needed=r_o.needed;
-        *returned=r_o.returned;
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, PORT_INFO_1, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(PORT_INFO_1));
+       } else {
+               inf = NULL;
+       }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       prs_set_offset(&buffer->prs, 0);
 
-        cli_connection_unlink(con);
+       for (i=0; i<returned; i++) {
+               if (!smb_io_port_info_1("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        return r_o.status;
+       *info=inf;
+       return True;
 }
 
-/****************************************************************************
-do a SPOOLSS Enum Ports
-****************************************************************************/
-uint32 spoolss_enum_ports(fstring srv_name, uint32 level,
-                             NEW_BUFFER *buffer, uint32 offered,
-                             uint32 *needed, uint32 *returned)
-{
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_ENUMPORTS q_o;
-        SPOOL_R_ENUMPORTS r_o;
-       TALLOC_CTX *ctx = prs_get_mem_context(&buffer->prs);
+/**********************************************************************
+**********************************************************************/
 
-        struct cli_connection *con = NULL;
+static BOOL decode_port_info_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                       uint32 returned, PORT_INFO_2 **info)
+{
+       uint32 i;
+       PORT_INFO_2 *inf;
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, PORT_INFO_2, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(PORT_INFO_2));
+       } else {
+               inf = NULL;
+       }
 
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+       prs_set_offset(&buffer->prs, 0);
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMPORTS */
+       for (i=0; i<returned; i++) {
+               if (!smb_io_port_info_2("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        DEBUG(5,("SPOOLSS Enum Ports (Server: %s level: %d)\n", srv_name, level));
+       *info=inf;
+       return True;
+}
 
-        make_spoolss_q_enumports(&q_o, "", level, buffer, offered);
+/**********************************************************************
+**********************************************************************/
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_enumports("", &q_o, &buf, 0) ) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+static BOOL decode_printer_driver_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                       uint32 returned, DRIVER_INFO_1 **info)
+{
+       uint32 i;
+       DRIVER_INFO_1 *inf;
 
-                cli_connection_unlink(con);
-        }
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, DRIVER_INFO_1, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(DRIVER_INFO_1));
+       } else {
+               inf = NULL;
+       }
 
-        if(!rpc_con_pipe_req(con, SPOOLSS_ENUMPORTS, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+       prs_set_offset(&buffer->prs,0);
 
-                cli_connection_unlink(con);
-        }
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_driver_info_1("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        prs_mem_free(&buf );
-        ZERO_STRUCT(r_o);
+       *info=inf;
+       return True;
+}
 
-        prs_switch_type(&buffer->prs, UNMARSHALL);
-        prs_set_offset(&buffer->prs, 0);
-        r_o.buffer=buffer;
+/**********************************************************************
+**********************************************************************/
 
-        if(!new_spoolss_io_r_enumports("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-                cli_connection_unlink(con);
-        }
+static BOOL decode_printer_driver_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                       uint32 returned, DRIVER_INFO_2 **info)
+{
+       uint32 i;
+       DRIVER_INFO_2 *inf;
 
-        *needed=r_o.needed;
-        *returned=r_o.returned;
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, DRIVER_INFO_2, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(DRIVER_INFO_2));
+       } else {
+               inf = NULL;
+       }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       prs_set_offset(&buffer->prs,0);
 
-        cli_connection_unlink(con);
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_driver_info_2("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        return r_o.status;
+       *info=inf;
+       return True;
 }
 
-/****************************************************************************
-do a SPOOLSS Enum Jobs
-****************************************************************************/
-uint32 spoolss_enum_jobs(const POLICY_HND *hnd, uint32 firstjob, uint32 numofjobs,
-                         uint32 level, NEW_BUFFER *buffer, uint32 offered,
-                         uint32 *needed, uint32 *returned)
+/**********************************************************************
+**********************************************************************/
+
+static BOOL decode_printer_driver_3(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                       uint32 returned, DRIVER_INFO_3 **info)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_ENUMJOBS q_o;
-        SPOOL_R_ENUMJOBS r_o;
-       TALLOC_CTX *ctx = prs_get_mem_context(&buffer->prs);
+       uint32 i;
+       DRIVER_INFO_3 *inf;
 
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+       if (returned) {
+               inf=TALLOC_ARRAY(mem_ctx, DRIVER_INFO_3, returned);
+               if (!inf) {
+                       return False;
+               }
+               memset(inf, 0, returned*sizeof(DRIVER_INFO_3));
+       } else {
+               inf = NULL;
+       }
 
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+       prs_set_offset(&buffer->prs,0);
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_driver_info_3("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        DEBUG(5,("SPOOLSS Enum Jobs level: %d)\n", level));
+       *info=inf;
+       return True;
+}
 
-        make_spoolss_q_enumjobs(&q_o, hnd, firstjob, numofjobs, level, buffer, offered);
+/**********************************************************************
+**********************************************************************/
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_enumjobs("", &q_o, &buf, 0)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+static BOOL decode_printerdriverdir_1 (TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer,
+                       uint32 returned, DRIVER_DIRECTORY_1 **info
+)
+{
+       DRIVER_DIRECTORY_1 *inf;
+       inf=TALLOC_P(mem_ctx, DRIVER_DIRECTORY_1);
+       if (!inf) {
+               return False;
+       }
+       memset(inf, 0, sizeof(DRIVER_DIRECTORY_1));
 
-        if(!rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMJOBS, &buf, &rbuf))
-        {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+       prs_set_offset(&buffer->prs, 0);
 
-        ZERO_STRUCT(r_o);
-        prs_mem_free(&buf );
+       if (!smb_io_driverdir_1("", buffer, inf, 0)) {
+               return False;
+       }
+       *info=inf;
+       return True;
+}
 
-        r_o.buffer=buffer;
+/**********************************************************************
+**********************************************************************/
 
-        if(!spoolss_io_r_enumjobs("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-        }
+static BOOL decode_jobs_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                         uint32 num_jobs, JOB_INFO_1 **jobs)
+{
+       uint32 i;
 
-        *needed=r_o.needed;
-        *returned=r_o.returned;
+       if (num_jobs) {
+               *jobs = TALLOC_ARRAY(mem_ctx, JOB_INFO_1, num_jobs);
+               if (*jobs == NULL) {
+                       return False;
+               }
+       } else {
+               *jobs = NULL;
+       }
+       prs_set_offset(&buffer->prs,0);
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       for (i = 0; i < num_jobs; i++) {
+               if (!smb_io_job_info_1("", buffer, &((*jobs)[i]), 0)) {
+                       return False;
+               }
+       }
 
-        return r_o.status;
+       return True;
 }
 
-/***************************************************************************
-do a SPOOLSS Enum printer datas
-****************************************************************************/
-uint32 spoolss_enum_printerdata(const POLICY_HND *hnd, uint32 idx,
-                               uint32 *valuelen, uint16 *value, uint32 *rvaluelen,
-                               uint32 *type, uint32 *datalen, uint8 *data, 
-                               uint32 *rdatalen)
+/**********************************************************************
+**********************************************************************/
+
+static BOOL decode_jobs_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                         uint32 num_jobs, JOB_INFO_2 **jobs)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_ENUMPRINTERDATA q_o;
-        SPOOL_R_ENUMPRINTERDATA r_o;
-       TALLOC_CTX *mem_ctx = NULL;
-       
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+       uint32 i;
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
+       if (num_jobs) {
+               *jobs = TALLOC_ARRAY(mem_ctx, JOB_INFO_2, num_jobs);
+               if (*jobs == NULL) {
+                       return False;
+               }
+       } else {
+               *jobs = NULL;
+       }
+       prs_set_offset(&buffer->prs,0);
+
+       for (i = 0; i < num_jobs; i++) {
+               if (!smb_io_job_info_2("", buffer, &((*jobs)[i]), 0)) {
+                       return False;
+               }
        }
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, mem_ctx, UNMARSHALL);
 
-        /* create and send a MSRPC command with api  SPOOLSS_ENUMPRINTERDATA*/
+       return True;
+}
+
+/**********************************************************************
+**********************************************************************/
 
-        DEBUG(4,("SPOOLSS Enum Printer data\n"));
+static BOOL decode_forms_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                          uint32 num_forms, FORM_1 **forms)
+{
+       int i;
+
+       if (num_forms) {
+               *forms = TALLOC_ARRAY(mem_ctx, FORM_1, num_forms);
+               if (*forms == NULL) {
+                       return False;
+               }
+       } else {
+               *forms = NULL;
+       }
 
-        make_spoolss_q_enumprinterdata(&q_o, hnd, idx, *valuelen, *datalen);
+       prs_set_offset(&buffer->prs,0);
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_enumprinterdata("", &q_o, &buf, 0)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+       for (i = 0; i < num_forms; i++) {
+               if (!smb_io_form_1("", buffer, &((*forms)[i]), 0)) {
+                       return False;
+               }
+       }
 
-        if(!rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMPRINTERDATA, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+       return True;
+}
 
-        ZERO_STRUCT(r_o);
-        prs_mem_free(&buf );
+/**********************************************************************
+**********************************************************************/
 
-        r_o.data=data;
-        r_o.value=value;
+WERROR rpccli_spoolss_open_printer_ex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                               const char *printername, const char *datatype, uint32 access_required,
+                               const char *station, const char *username, POLICY_HND *pol)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_OPEN_PRINTER_EX in;
+       SPOOL_R_OPEN_PRINTER_EX out;
 
-        if(!spoolss_io_r_enumprinterdata("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-        }
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
-        *valuelen=r_o.valuesize;
-        *rvaluelen=r_o.realvaluesize;
-        *type=r_o.type;
-        *datalen=r_o.datasize;
-        *rdatalen=r_o.realdatasize;
+        make_spoolss_q_open_printer_ex( &in, printername, datatype,
+               access_required, station, username );
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_OPENPRINTEREX,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_open_printer_ex,
+                   spoolss_io_r_open_printer_ex, 
+                   WERR_GENERAL_FAILURE );
 
-        return r_o.status;
+       memcpy( pol, &out.handle, sizeof(POLICY_HND) );
+       
+       return out.status;
 }
 
-/****************************************************************************
-do a SPOOLSS Enum printer datas
-****************************************************************************/
-uint32 spoolss_getprinter(const POLICY_HND *hnd, uint32 level,
-                             NEW_BUFFER *buffer, uint32 offered,
-                             uint32 *needed)
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_close_printer(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                POLICY_HND *pol)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_GETPRINTER q_o;
-        SPOOL_R_GETPRINTER r_o;
-       TALLOC_CTX *ctx = prs_get_mem_context(&buffer->prs);
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_CLOSEPRINTER in;
+       SPOOL_R_CLOSEPRINTER out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_closeprinter( &in, pol );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_CLOSEPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_closeprinter,
+                   spoolss_io_r_closeprinter, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
+}
 
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+/**********************************************************************
+**********************************************************************/
 
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+WERROR rpccli_spoolss_enum_printers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                char *name, uint32 flags, uint32 level,
+                                uint32 *num_printers, PRINTER_INFO_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMPRINTERS in;
+        SPOOL_R_ENUMPRINTERS out;
+       RPC_BUFFER buffer;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_enumprinters( &in, flags, name, level, &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERS,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumprinters,
+                   spoolss_io_r_enumprinters, 
+                   WERR_GENERAL_FAILURE );
+                   
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_enumprinters( &in, flags, name, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumprinters,
+                           spoolss_io_r_enumprinters, 
+                           WERR_GENERAL_FAILURE );
+       }
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
 
-        DEBUG(5,("SPOOLSS Enum Printer data)\n"));
+       switch (level) {
+       case 0:
+               if (!decode_printer_info_0(mem_ctx, out.buffer, out.returned, &ctr->printers_0)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 1:
+               if (!decode_printer_info_1(mem_ctx, out.buffer, out.returned, &ctr->printers_1)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 2:
+               if (!decode_printer_info_2(mem_ctx, out.buffer, out.returned, &ctr->printers_2)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 3:
+               if (!decode_printer_info_3(mem_ctx, out.buffer, out.returned, &ctr->printers_3)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       default:
+               return WERR_UNKNOWN_LEVEL;
+       }                       
 
-        make_spoolss_q_getprinter(&q_o, hnd, level, buffer, offered);
+       *num_printers = out.returned;
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_getprinter("", &q_o, &buf, 0)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+       return out.status;
+}
 
-        if(!rpc_hnd_pipe_req(hnd, SPOOLSS_GETPRINTER, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+/**********************************************************************
+**********************************************************************/
 
-        ZERO_STRUCT(r_o);
-        prs_mem_free(&buf );
+WERROR rpccli_spoolss_enum_ports(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                             uint32 level, uint32 *num_ports, PORT_INFO_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMPORTS in;
+        SPOOL_R_ENUMPORTS out;
+       RPC_BUFFER buffer;
+       fstring server;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+        strupper_m(server);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_enumports( &in, server, level, &buffer, offered );
+       
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPORTS,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumports,
+                   spoolss_io_r_enumports, 
+                   WERR_GENERAL_FAILURE );
+                       
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_enumports( &in, server, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPORTS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumports,
+                           spoolss_io_r_enumports, 
+                           WERR_GENERAL_FAILURE );
+       }
+       
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
+       
+       switch (level) {
+       case 1:
+               if (!decode_port_info_1(mem_ctx, out.buffer, out.returned, &ctr->port.info_1)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 2:
+               if (!decode_port_info_2(mem_ctx, out.buffer, out.returned, &ctr->port.info_2)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       default:
+               return WERR_UNKNOWN_LEVEL;
+       }
+
+       *num_ports = out.returned;
 
-        prs_switch_type(&buffer->prs, UNMARSHALL);
-        prs_set_offset(&buffer->prs, 0);
-        r_o.buffer=buffer;
+       return out.status;
+}
 
-        if(!spoolss_io_r_getprinter("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-        }
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_getprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                             POLICY_HND *pol, uint32 level, 
+                             PRINTER_INFO_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETPRINTER in;
+       SPOOL_R_GETPRINTER out;
+       RPC_BUFFER buffer;
+       uint32 offered;
 
-        *needed=r_o.needed;
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       /* Initialise input parameters */
 
-        return r_o.status;
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_getprinter( mem_ctx, &in, pol, level, &buffer, offered );
+       
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getprinter,
+                   spoolss_io_r_getprinter, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_getprinter( mem_ctx, &in, pol, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTER,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getprinter,
+                           spoolss_io_r_getprinter, 
+                           WERR_GENERAL_FAILURE );
+       }
+       
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
+               
+       switch (level) {
+       case 0:
+               if (!decode_printer_info_0(mem_ctx, out.buffer, 1, &ctr->printers_0)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 1:
+               if (!decode_printer_info_1(mem_ctx, out.buffer, 1, &ctr->printers_1)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 2:
+               if (!decode_printer_info_2(mem_ctx, out.buffer, 1, &ctr->printers_2)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 3:
+               if (!decode_printer_info_3(mem_ctx, out.buffer, 1, &ctr->printers_3)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 7:
+               if (!decode_printer_info_7(mem_ctx, out.buffer, 1, &ctr->printers_7)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       default:
+               return WERR_UNKNOWN_LEVEL;
+       }
+
+       return out.status;
 }
 
-/****************************************************************************
-do a SPOOLSS Enum printer driver
-****************************************************************************/
-uint32 spoolss_getprinterdriver(const POLICY_HND *hnd,
-                                const char *environment, uint32 level,
-                                NEW_BUFFER *buffer, uint32 offered,
-                                uint32 *needed)
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_setprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                             POLICY_HND *pol, uint32 level, 
+                             PRINTER_INFO_CTR *ctr, uint32 command)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_GETPRINTERDRIVER2 q_o;
-        SPOOL_R_GETPRINTERDRIVER2 r_o;
-       TALLOC_CTX *ctx = prs_get_mem_context(&buffer->prs);
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_SETPRINTER in;
+       SPOOL_R_SETPRINTER out;
 
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+       make_spoolss_q_setprinter( mem_ctx, &in, pol, level, ctr, command );
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_setprinter,
+                   spoolss_io_r_setprinter, 
+                   WERR_GENERAL_FAILURE );
 
-        DEBUG(5,("SPOOLSS Enum Printer driver)\n"));
+       return out.status;
+}
 
-        make_spoolss_q_getprinterdriver2(&q_o, hnd, environment, level, 2, 0, buffer, offered);
+/**********************************************************************
+**********************************************************************/
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_getprinterdriver2("", &q_o, &buf, 0)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+WERROR rpccli_spoolss_getprinterdriver(struct rpc_pipe_client *cli, 
+                                   TALLOC_CTX *mem_ctx, 
+                                   POLICY_HND *pol, uint32 level, 
+                                   const char *env, int version, PRINTER_DRIVER_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETPRINTERDRIVER2 in;
+        SPOOL_R_GETPRINTERDRIVER2 out;
+       RPC_BUFFER buffer;
+       fstring server;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       fstrcpy(server, cli->cli->desthost);
+       strupper_m(server);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_getprinterdriver2( &in, pol, env, level, 
+               version, 2, &buffer, offered);
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVER2,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getprinterdriver2,
+                   spoolss_io_r_getprinterdriver2, 
+                   WERR_GENERAL_FAILURE );
+                   
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_getprinterdriver2( &in, pol, env, level, 
+                       version, 2, &buffer, offered);
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVER2,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getprinterdriver2,
+                           spoolss_io_r_getprinterdriver2, 
+                           WERR_GENERAL_FAILURE );
+       }
+               
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
 
-        if(!rpc_hnd_pipe_req(hnd, SPOOLSS_GETPRINTERDRIVER2, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+       switch (level) {
+       case 1:
+               if (!decode_printer_driver_1(mem_ctx, out.buffer, 1, &ctr->info1)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 2:
+               if (!decode_printer_driver_2(mem_ctx, out.buffer, 1, &ctr->info2)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 3:
+               if (!decode_printer_driver_3(mem_ctx, out.buffer, 1, &ctr->info3)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       default:
+               return WERR_UNKNOWN_LEVEL;
+       }
 
-        ZERO_STRUCT(r_o);
-        prs_mem_free(&buf );
+       return out.status;      
+}
 
-        prs_switch_type(&buffer->prs, UNMARSHALL);
-        prs_set_offset(&buffer->prs, 0);
-        r_o.buffer=buffer;
+/**********************************************************************
+**********************************************************************/
 
-        if(!spoolss_io_r_getprinterdriver2("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-        }
+WERROR rpccli_spoolss_enumprinterdrivers (struct rpc_pipe_client *cli, 
+                                      TALLOC_CTX *mem_ctx,
+                                      uint32 level, const char *env,
+                                      uint32 *num_drivers,
+                                      PRINTER_DRIVER_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMPRINTERDRIVERS in;
+        SPOOL_R_ENUMPRINTERDRIVERS out;
+       RPC_BUFFER buffer;
+       fstring server;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+        strupper_m(server);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_enumprinterdrivers( &in, server, env, level, 
+               &buffer, offered);
+       
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDRIVERS,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumprinterdrivers,
+                   spoolss_io_r_enumprinterdrivers, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_enumprinterdrivers( &in, server, env, level, 
+                       &buffer, offered);
+       
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDRIVERS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumprinterdrivers,
+                           spoolss_io_r_enumprinterdrivers, 
+                           WERR_GENERAL_FAILURE );
+       }
+       
+       *num_drivers = out.returned;
 
-        *needed=r_o.needed;
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
+               
+       if ( out.returned ) {
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+               switch (level) {
+               case 1:
+                       if (!decode_printer_driver_1(mem_ctx, out.buffer, out.returned, &ctr->info1)) {
+                               return WERR_GENERAL_FAILURE;
+                       }
+                       break;
+               case 2:
+                       if (!decode_printer_driver_2(mem_ctx, out.buffer, out.returned, &ctr->info2)) {
+                               return WERR_GENERAL_FAILURE;
+                       }
+                       break;
+               case 3:
+                       if (!decode_printer_driver_3(mem_ctx, out.buffer, out.returned, &ctr->info3)) {
+                               return WERR_GENERAL_FAILURE;
+                       }
+                       break;
+               default:
+                       return WERR_UNKNOWN_LEVEL;
+               }
+       }
 
-        return r_o.status;
+       return out.status;
 }
 
 
+/**********************************************************************
+**********************************************************************/
 
-/****************************************************************************
-do a SPOOLSS Open Printer Ex
-****************************************************************************/
-BOOL spoolss_open_printer_ex(  const char *printername,
-                         const char *datatype, uint32 access_required,
-                         const char *station,  const char *username,
-                        POLICY_HND *hnd)
+WERROR rpccli_spoolss_getprinterdriverdir (struct rpc_pipe_client *cli, 
+                                       TALLOC_CTX *mem_ctx,
+                                       uint32 level, char *env,
+                                       DRIVER_DIRECTORY_CTR *ctr)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_OPEN_PRINTER_EX q_o;
-        BOOL valid_pol = False;
-        fstring srv_name;
-        char *s = NULL;
-        struct cli_connection *con = NULL;
-       TALLOC_CTX *mem_ctx = NULL;
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETPRINTERDRIVERDIR in;
+        SPOOL_R_GETPRINTERDRIVERDIR out;
+       RPC_BUFFER buffer;
+       fstring server;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+        strupper_m(server);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_getprinterdriverdir( &in, server, env, level, 
+               &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVERDIRECTORY,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getprinterdriverdir,
+                   spoolss_io_r_getprinterdriverdir, 
+                   WERR_GENERAL_FAILURE );
+                   
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_getprinterdriverdir( &in, server, env, level, 
+                       &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVERDIRECTORY,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getprinterdriverdir,
+                           spoolss_io_r_getprinterdriverdir, 
+                           WERR_GENERAL_FAILURE );
+       }
        
-        memset(srv_name, 0, sizeof(srv_name));
-        fstrcpy(srv_name, printername);
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
+               
+       if (!decode_printerdriverdir_1(mem_ctx, out.buffer, 1, &ctr->info1)) {
+               return WERR_GENERAL_FAILURE;
+       }
 
-        s = strchr(&srv_name[2], '\\');
-       if (s != NULL)
-               *s = '\0';
+       return out.status;
+}
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+/**********************************************************************
+**********************************************************************/
 
-        if (hnd == NULL) 
-               return False;
+WERROR rpccli_spoolss_addprinterdriver (struct rpc_pipe_client *cli, 
+                                    TALLOC_CTX *mem_ctx, uint32 level,
+                                    PRINTER_DRIVER_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ADDPRINTERDRIVER in;
+        SPOOL_R_ADDPRINTERDRIVER out;
+       fstring server;
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
-       }
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, mem_ctx, UNMARSHALL);
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+       
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+        strupper_m(server);
 
-        /* create and send a MSRPC command with api SPOOLSS_OPENPRINTEREX */
+       make_spoolss_q_addprinterdriver( mem_ctx, &in, server, level, ctr );
 
-        DEBUG(5,("SPOOLSS Open Printer Ex\n"));
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ADDPRINTERDRIVER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_addprinterdriver,
+                   spoolss_io_r_addprinterdriver, 
+                   WERR_GENERAL_FAILURE );
 
-        make_spoolss_q_open_printer_ex(&q_o, printername, datatype,
-                                       access_required, station, username);
+       return out.status;                  
+}
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_open_printer_ex("", &q_o, &buf, 0) &&
-            rpc_con_pipe_req(con, SPOOLSS_OPENPRINTEREX, &buf, &rbuf))
-        {
-                SPOOL_R_OPEN_PRINTER_EX r_o;
-               BOOL p = True;
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_addprinterex (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                uint32 level, PRINTER_INFO_CTR*ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ADDPRINTEREX in;
+        SPOOL_R_ADDPRINTEREX out;
+       fstring server, client, user;
 
-                spoolss_io_r_open_printer_ex("", &r_o, &rbuf, 0);
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+       
+        slprintf(client, sizeof(fstring)-1, "\\\\%s", global_myname());
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+       
+        strupper_m(client);
+        strupper_m(server);
 
-                if (prs_offset(&rbuf)!= 0 && r_o.status != 0)
-                {
-                        /* report error code */
-                        DEBUG(5,("SPOOLSS_OPENPRINTEREX: %s\n", get_nt_error_msg(r_o.status)));
-                        p = False;
-                }
+       fstrcpy  (user, cli->user_name);
 
-                if (p)
-                {
-                        /* ok, at last: we're happy. return the policy handle */
-                        *hnd = r_o.handle;
+       make_spoolss_q_addprinterex( mem_ctx, &in, server, client, 
+               user, level, ctr);
 
-                       /* associate the handle returned with the current 
-                          state of the clienjt connection */
-                       valid_pol = RpcHndList_set_connection(hnd, con);
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ADDPRINTEREX,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_addprinterex,
+                   spoolss_io_r_addprinterex, 
+                   WERR_GENERAL_FAILURE );
 
-                }
-        }
+       return out.status;      
+}
 
-       prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+/**********************************************************************
+**********************************************************************/
 
-        return valid_pol;
+WERROR rpccli_spoolss_deleteprinterdriverex(struct rpc_pipe_client *cli, 
+                                         TALLOC_CTX *mem_ctx, const char *arch,
+                                         const char *driver, int version)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_DELETEPRINTERDRIVEREX in;
+       SPOOL_R_DELETEPRINTERDRIVEREX out;
+       fstring server;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(server);
+
+       make_spoolss_q_deleteprinterdriverex( mem_ctx, &in, server, arch, driver, version );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDRIVEREX,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_deleteprinterdriverex,
+                   spoolss_io_r_deleteprinterdriverex, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;      
 }
 
-/****************************************************************************
- do a SPOOLSS AddPrinterEx()
- **ALWAYS** uses as PRINTER_INFO level 2 struct
-****************************************************************************/
-BOOL spoolss_addprinterex(POLICY_HND *hnd, const char* srv_name, PRINTER_INFO_2 *info2)
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_deleteprinterdriver (struct rpc_pipe_client *cli, 
+                                       TALLOC_CTX *mem_ctx, const char *arch,
+                                       const char *driver)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_ADDPRINTEREX q_o;
-        SPOOL_R_ADDPRINTEREX r_o;
-       struct cli_connection *con = NULL;
-       TALLOC_CTX *mem_ctx = NULL;
-        fstring client_name;
-       BOOL valid_pol = True;
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_DELETEPRINTERDRIVER in;
+        SPOOL_R_DELETEPRINTERDRIVER out;
+       fstring server;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+        strupper_m(server);
+
+       make_spoolss_q_deleteprinterdriver( mem_ctx, &in, server, arch, driver );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDRIVER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_deleteprinterdriver,
+                   spoolss_io_r_deleteprinterdriver, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;      
+}
 
+/**********************************************************************
+**********************************************************************/
 
+WERROR rpccli_spoolss_getprintprocessordirectory(struct rpc_pipe_client *cli,
+                                             TALLOC_CTX *mem_ctx,
+                                             char *name, char *environment,
+                                             fstring procdir)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETPRINTPROCESSORDIRECTORY in;
+       SPOOL_R_GETPRINTPROCESSORDIRECTORY out;
+       int level = 1;
+       RPC_BUFFER buffer;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_getprintprocessordirectory( &in, name, 
+               environment, level, &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTPROCESSORDIRECTORY,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getprintprocessordirectory,
+                   spoolss_io_r_getprintprocessordirectory, 
+                   WERR_GENERAL_FAILURE );
+                   
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_getprintprocessordirectory( &in, name, 
+                       environment, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTPROCESSORDIRECTORY,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getprintprocessordirectory,
+                           spoolss_io_r_getprintprocessordirectory, 
+                           WERR_GENERAL_FAILURE );
+       }
+       
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
+       
+       fstrcpy(procdir, "Not implemented!");
+       
+       return out.status;
+}
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return NT_STATUS_ACCESS_DENIED;
+/**********************************************************************
+**********************************************************************/
 
-        if (hnd == NULL)
-               return NT_STATUS_INVALID_PARAMETER;
+WERROR rpccli_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                          POLICY_HND *handle, uint32 level, FORM *form)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ADDFORM in;
+       SPOOL_R_ADDFORM out;
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("spoolss_addprinterex: talloc_init() failed!\n"));
-               return NT_STATUS_ACCESS_DENIED;
-       }
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, mem_ctx, UNMARSHALL);
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMPORTS */
-        DEBUG(5,("SPOOLSS Add Printer Ex (Server: %s)\n", srv_name));
-       
-        fstrcpy(client_name, "\\\\");
-        fstrcat(client_name, con->pCli_state->desthost);
-        strupper(client_name);
+        make_spoolss_q_addform( &in, handle, level, form );
        
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ADDFORM,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_addform,
+                   spoolss_io_r_addform, 
+                   WERR_GENERAL_FAILURE );
+
+       return out.status;
+}
 
-        make_spoolss_q_addprinterex(&q_o, srv_name, client_name, 
-                                   /* "Administrator", */
-                                   con->pCli_state->user_name,
-                                   2, info2);
-
-        /* turn parameters into data stream and send the request */
-        if (spoolss_io_q_addprinterex("", &q_o, &buf, 0) &&
-           rpc_con_pipe_req(con, SPOOLSS_ADDPRINTEREX, &buf, &rbuf)) 
-       {
-               ZERO_STRUCT(r_o);
-
-               if(spoolss_io_r_addprinterex("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
-                        {
-                               /* report error code */
-                               DEBUG(0,("SPOOLSS_ADDPRINTEREX: %s\n", get_nt_error_msg(r_o.status)));
-                               valid_pol = False;
-                       }
-               }
-               
-               if (valid_pol)
-               {
-                        /* ok, at last: we're happy. return the policy handle */
-                        copy_policy_hnd( hnd, &r_o.handle);
+/**********************************************************************
+**********************************************************************/
 
-                       /* associate the handle returned with the current 
-                          state of the clienjt connection */
-                       RpcHndList_set_connection(hnd, con);
-               }
-        }
+WERROR rpccli_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                          POLICY_HND *handle, uint32 level, 
+                          const char *form_name, FORM *form)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_SETFORM in;
+       SPOOL_R_SETFORM out;
 
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-       free_spoolss_q_addprinterex(&q_o);
+        make_spoolss_q_setform( &in, handle, level, form_name, form );
+       
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETFORM,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_setform,
+                   spoolss_io_r_setform, 
+                   WERR_GENERAL_FAILURE );
+
+       return out.status;
+}
 
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+/**********************************************************************
+**********************************************************************/
 
-        return valid_pol;
+WERROR rpccli_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                          POLICY_HND *handle, const char *formname, 
+                          uint32 level, FORM_1 *form)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETFORM in;
+       SPOOL_R_GETFORM out;
+       RPC_BUFFER buffer;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_getform( &in, handle, formname, level, &buffer, offered );
+       
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETFORM,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getform,
+                   spoolss_io_r_getform, 
+                   WERR_GENERAL_FAILURE );
+                   
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_getform( &in, handle, formname, level, &buffer, offered );
+       
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETFORM,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getform,
+                           spoolss_io_r_getform, 
+                           WERR_GENERAL_FAILURE );
+       }
+       
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
+
+       if (!smb_io_form_1("", out.buffer, form, 0)) {
+               return WERR_GENERAL_FAILURE;
+       }
+
+       return out.status;
 }
 
-/****************************************************************************
-do a SPOOL Close
-****************************************************************************/
-BOOL spoolss_closeprinter(POLICY_HND *hnd)
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_deleteform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                             POLICY_HND *handle, const char *form_name)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_CLOSEPRINTER q_c;
-        BOOL valid_close = False;
-       TALLOC_CTX *mem_ctx = NULL;
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_DELETEFORM in;
+       SPOOL_R_DELETEFORM out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_deleteform( &in, handle, form_name );
        
-        if (hnd == NULL) 
-               return False;
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEFORM,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_deleteform,
+                   spoolss_io_r_deleteform, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
+}
 
-        /* create and send a MSRPC command with api SPOOLSS_CLOSEPRINTER */
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                            POLICY_HND *handle, int level, uint32 *num_forms,
+                            FORM_1 **forms)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMFORMS in;
+       SPOOL_R_ENUMFORMS out;
+       RPC_BUFFER buffer;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_enumforms( &in, handle, level, &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMFORMS,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumforms,
+                   spoolss_io_r_enumforms, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_enumforms( &in, handle, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMFORMS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumforms,
+                           spoolss_io_r_enumforms, 
+                           WERR_GENERAL_FAILURE );
        }
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, mem_ctx, UNMARSHALL);
 
-        DEBUG(4,("SPOOL Close Printer\n"));
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
 
-        /* store the parameters */
-        make_spoolss_q_closeprinter(&q_c, hnd);
+       *num_forms = out.numofforms;
+       
+       if (!decode_forms_1(mem_ctx, out.buffer, *num_forms, forms)) {
+               return WERR_GENERAL_FAILURE;
+       }
+
+       return out.status;
+}
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_closeprinter("", &q_c, &buf, 0) &&
-            rpc_hnd_pipe_req(hnd, SPOOLSS_CLOSEPRINTER, &buf, &rbuf))
-        {
-                SPOOL_R_CLOSEPRINTER r_c;
+/**********************************************************************
+**********************************************************************/
 
-                spoolss_io_r_closeprinter("", &r_c, &rbuf, 0);
+WERROR rpccli_spoolss_enumjobs(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                           POLICY_HND *hnd, uint32 level, uint32 firstjob, 
+                           uint32 num_jobs, uint32 *returned, JOB_INFO_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMJOBS in;
+       SPOOL_R_ENUMJOBS out;
+       RPC_BUFFER buffer;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_enumjobs( &in, hnd, firstjob, num_jobs, level, 
+               &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMJOBS,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumjobs,
+                   spoolss_io_r_enumjobs, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_enumjobs( &in, hnd, firstjob, num_jobs, level, 
+                       &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMJOBS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumjobs,
+                           spoolss_io_r_enumjobs, 
+                           WERR_GENERAL_FAILURE );
+       }
 
-                if (prs_offset(&rbuf)!=0 && r_c.status != 0)
-                {
-                        /* report error code */
-                        DEBUG(0,("SPOOL_CLOSEPRINTER: %s\n", get_nt_error_msg(r_c.status)));
-                }
-               else
-                       valid_close = True;
-        }
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
+               
+       switch(level) {
+       case 1:
+               if (!decode_jobs_1(mem_ctx, out.buffer, out.returned, &ctr->job.job_info_1)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 2:
+               if (!decode_jobs_2(mem_ctx, out.buffer, out.returned, &ctr->job.job_info_2)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       default:
+               DEBUG(3, ("unsupported info level %d", level));
+               return WERR_UNKNOWN_LEVEL;
+       }
+       
+       *returned = out.returned;
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+       return out.status;
+}
 
-       /* disassociate with the cli_connection */
-        RpcHndList_del_connection(hnd);
+/**********************************************************************
+**********************************************************************/
 
-        return valid_close;
+WERROR rpccli_spoolss_setjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                         POLICY_HND *hnd, uint32 jobid, uint32 level, 
+                         uint32 command)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_SETJOB in;
+       SPOOL_R_SETJOB out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_setjob( &in, hnd, jobid, level, command );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETJOB,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_setjob,
+                   spoolss_io_r_setjob, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
 }
 
-/****************************************************************************
-do a SPOOLSS Get printer datas
-****************************************************************************/
-uint32 spoolss_getprinterdata(const POLICY_HND *hnd, const UNISTR2 *valuename,
-                        uint32 in_size,
-                        uint32 *type,
-                        uint32 *out_size,
-                        uint8 *data,
-                        uint32 *needed)
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                         POLICY_HND *hnd, uint32 jobid, uint32 level,
+                         JOB_INFO_CTR *ctr)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_GETPRINTERDATA q_o;
-        SPOOL_R_GETPRINTERDATA r_o;
-       TALLOC_CTX *mem_ctx = NULL;
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETJOB in;
+       SPOOL_R_GETJOB out;
+       RPC_BUFFER buffer;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       rpcbuf_init(&buffer, offered, mem_ctx);
+       make_spoolss_q_getjob( &in, hnd, jobid, level, &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETJOB,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getjob,
+                   spoolss_io_r_getjob, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               rpcbuf_init(&buffer, offered, mem_ctx);
+               make_spoolss_q_getjob( &in, hnd, jobid, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETJOB,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getjob,
+                           spoolss_io_r_getjob, 
+                           WERR_GENERAL_FAILURE );
+       }
 
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
+       switch(level) {
+       case 1:
+               if (!decode_jobs_1(mem_ctx, out.buffer, 1, &ctr->job.job_info_1)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       case 2:
+               if (!decode_jobs_2(mem_ctx, out.buffer, 1, &ctr->job.job_info_2)) {
+                       return WERR_GENERAL_FAILURE;
+               }
+               break;
+       default:
+               return WERR_UNKNOWN_LEVEL;
        }
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, mem_ctx, UNMARSHALL);
 
-        /* create and send a MSRPC command with api SPOOLSS_GETPRINTERDATA */
+       return out.status;
+}
+
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_startpageprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                   POLICY_HND *hnd)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_STARTPAGEPRINTER in;
+       SPOOL_R_STARTPAGEPRINTER out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_startpageprinter( &in, hnd );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_STARTPAGEPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_startpageprinter,
+                   spoolss_io_r_startpageprinter, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
+}
+
+/**********************************************************************
+**********************************************************************/
 
-        DEBUG(5,("SPOOLSS Get Printer data)\n"));
+WERROR rpccli_spoolss_endpageprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                 POLICY_HND *hnd)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENDPAGEPRINTER in;
+       SPOOL_R_ENDPAGEPRINTER out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_endpageprinter( &in, hnd );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENDPAGEPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_endpageprinter,
+                   spoolss_io_r_endpageprinter, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
+}
 
-        make_spoolss_q_getprinterdata(&q_o, hnd, valuename, in_size);
+/**********************************************************************
+**********************************************************************/
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_getprinterdata("", &q_o, &buf, 0)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+WERROR rpccli_spoolss_startdocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                  POLICY_HND *hnd, char *docname, 
+                                  char *outputfile, char *datatype, 
+                                  uint32 *jobid)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_STARTDOCPRINTER in;
+       SPOOL_R_STARTDOCPRINTER out;
+       uint32 level = 1;
 
-        if (!rpc_hnd_pipe_req(hnd, SPOOLSS_GETPRINTERDATA, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
-        }
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
-        ZERO_STRUCT(r_o);
-        prs_mem_free(&buf );
+        make_spoolss_q_startdocprinter( &in, hnd, level, docname, 
+               outputfile, datatype );
 
-        r_o.data=data;
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_STARTDOCPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_startdocprinter,
+                   spoolss_io_r_startdocprinter, 
+                   WERR_GENERAL_FAILURE );
 
-        if(!spoolss_io_r_getprinterdata("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-        }
+       *jobid = out.jobid;
 
-        *type=r_o.type;
-        *out_size=r_o.size;
-        *needed=r_o.needed;
+       return out.status;
+}
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+/**********************************************************************
+**********************************************************************/
 
-        return r_o.status;
+WERROR rpccli_spoolss_enddocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                 POLICY_HND *hnd)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENDDOCPRINTER in;
+       SPOOL_R_ENDDOCPRINTER out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_enddocprinter( &in, hnd );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENDDOCPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enddocprinter,
+                   spoolss_io_r_enddocprinter, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
 }
 
-/****************************************************************************
-do a SPOOLSS Get Printer Driver Direcotry
-****************************************************************************/
-uint32 spoolss_getprinterdriverdir(fstring srv_name, fstring env_name, uint32 level,
-                             NEW_BUFFER *buffer, uint32 offered,
-                             uint32 *needed)
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                 POLICY_HND *hnd, const char *valuename, 
+                                 REGISTRY_VALUE *value)
 {
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_GETPRINTERDRIVERDIR q_o;
-        SPOOL_R_GETPRINTERDRIVERDIR r_o;
-       TALLOC_CTX *ctx = prs_get_mem_context(&buffer->prs);
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETPRINTERDATA in;
+       SPOOL_R_GETPRINTERDATA out;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       make_spoolss_q_getprinterdata( &in, hnd, valuename, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATA,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getprinterdata,
+                   spoolss_io_r_getprinterdata, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               make_spoolss_q_getprinterdata( &in, hnd, valuename, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATA,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getprinterdata,
+                           spoolss_io_r_getprinterdata, 
+                           WERR_GENERAL_FAILURE );
+       }
 
-        struct cli_connection *con = NULL;
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;      
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+       /* Return output parameters */
 
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+       if (out.needed) {
+               value->data_p = (uint8 *)TALLOC_MEMDUP(mem_ctx, out.data, out.needed);
+       } else {
+               value->data_p = NULL;
+       }
+       value->type = out.type;
+       value->size = out.size;
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
+       return out.status;
+}
 
-        DEBUG(5,("SPOOLSS GetPrinterDriverDir (Server: %s Env: %s level: %d)\n", 
-                 srv_name, env_name, level));
+/**********************************************************************
+**********************************************************************/
 
-        make_spoolss_q_getprinterdriverdir(&q_o, srv_name, env_name, level, 
-                                          buffer, offered);
+WERROR rpccli_spoolss_getprinterdataex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                   POLICY_HND *hnd, const char *keyname, 
+                                   const char *valuename, 
+                                   REGISTRY_VALUE *value)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_GETPRINTERDATAEX in;
+       SPOOL_R_GETPRINTERDATAEX out;
+       uint32 offered = 0;
 
-        /* turn parameters into data stream */
-        if (!spoolss_io_q_getprinterdriverdir("", &q_o, &buf, 0) ) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
-                cli_connection_unlink(con);
-        }
+       make_spoolss_q_getprinterdataex( &in, hnd, keyname, valuename, offered );
 
-        if(!rpc_con_pipe_req(con, SPOOLSS_GETPRINTERDRIVERDIRECTORY, &buf, &rbuf)) {
-                prs_mem_free(&rbuf);
-                prs_mem_free(&buf );
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATAEX,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_getprinterdataex,
+                   spoolss_io_r_getprinterdataex, 
+                   WERR_GENERAL_FAILURE );
 
-                cli_connection_unlink(con);
-        }
+       if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               make_spoolss_q_getprinterdataex( &in, hnd, keyname, valuename, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATAEX,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getprinterdataex,
+                           spoolss_io_r_getprinterdataex, 
+                           WERR_GENERAL_FAILURE );
+       }
 
-        prs_mem_free(&buf );
-        ZERO_STRUCT(r_o);
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;      
 
-        prs_switch_type(&buffer->prs, UNMARSHALL);
-        prs_set_offset(&buffer->prs, 0);
-        r_o.buffer=buffer;
+       /* Return output parameters */
 
-        if(!spoolss_io_r_getprinterdriverdir("", &r_o, &rbuf, 0)) {
-                prs_mem_free(&rbuf);
-                cli_connection_unlink(con);
-        }
-        *needed=r_o.needed;
+       if (out.needed) {
+               value->data_p = (uint8 *)TALLOC_MEMDUP(mem_ctx, out.data, out.needed);
+       } else {
+               value->data_p = NULL;
+       }
+       value->type = out.type;
+       value->size = out.needed;
+       
+       return out.status;
+}
+
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_setprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                 POLICY_HND *hnd, REGISTRY_VALUE *value)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_SETPRINTERDATA in;
+       SPOOL_R_SETPRINTERDATA out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_setprinterdata( &in, hnd, value->valuename, 
+               value->type, (char *)value->data_p, value->size);
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETPRINTERDATA,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_setprinterdata,
+                   spoolss_io_r_setprinterdata, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
+}
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+/**********************************************************************
+**********************************************************************/
 
-        cli_connection_unlink(con);
+WERROR rpccli_spoolss_setprinterdataex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                   POLICY_HND *hnd, char *keyname, 
+                                   REGISTRY_VALUE *value)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_SETPRINTERDATAEX in;
+       SPOOL_R_SETPRINTERDATAEX out;
+       
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_setprinterdataex( &in, hnd, keyname, value->valuename, 
+               value->type, (char *)value->data_p, value->size);
 
-        return r_o.status;
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETPRINTERDATAEX,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_setprinterdataex,
+                   spoolss_io_r_setprinterdataex, 
+                   WERR_GENERAL_FAILURE );
+
+       return out.status;
 }
 
-/******************************************************************************
- AddPrinterDriver()
- *****************************************************************************/
-uint32 spoolss_addprinterdriver(const char *srv_name, uint32 level, PRINTER_DRIVER_CTR *info)
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_enumprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                  POLICY_HND *hnd, uint32 ndx,
+                                  uint32 value_offered, uint32 data_offered,
+                                  uint32 *value_needed, uint32 *data_needed,
+                                  REGISTRY_VALUE *value)
 {
-        prs_struct                     rbuf;
-        prs_struct                     buf;
-        SPOOL_Q_ADDPRINTERDRIVER       q_o;
-        SPOOL_R_ADDPRINTERDRIVER       r_o;
-       TALLOC_CTX                      *mem_ctx = NULL;
-       struct cli_connection           *con = NULL;
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMPRINTERDATA in;
+       SPOOL_R_ENUMPRINTERDATA out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_enumprinterdata( &in, hnd, ndx, value_offered, data_offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATA,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumprinterdata,
+                   spoolss_io_r_enumprinterdata, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( value_needed )
+               *value_needed = out.realvaluesize;
+       if ( data_needed )
+               *data_needed = out.realdatasize;
+               
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
+
+       if (value) {
+               rpcstr_pull(value->valuename, out.value, sizeof(value->valuename), -1,
+                           STR_TERMINATE);
+               if (out.realdatasize) {
+                       value->data_p = (uint8 *)TALLOC_MEMDUP(mem_ctx, out.data,
+                                                      out.realdatasize);
+               } else {
+                       value->data_p = NULL;
+               }
+               value->type = out.type;
+               value->size = out.realdatasize;
+       }
        
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+       return out.status;
+}
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                    POLICY_HND *hnd, const char *keyname, 
+                                    REGVAL_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMPRINTERDATAEX in;
+       SPOOL_R_ENUMPRINTERDATAEX out;
+       int i;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       make_spoolss_q_enumprinterdataex( &in, hnd, keyname, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATAEX,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumprinterdataex,
+                   spoolss_io_r_enumprinterdataex, 
+                   WERR_GENERAL_FAILURE );
+
+       if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) {
+               offered = out.needed;
+               
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               make_spoolss_q_enumprinterdataex( &in, hnd, keyname, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATAEX,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumprinterdataex,
+                           spoolss_io_r_enumprinterdataex, 
+                           WERR_GENERAL_FAILURE );
        }
-        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, 4, mem_ctx, UNMARSHALL);
        
-       /* make the ADDPRINTERDRIVER PDU */
-       make_spoolss_q_addprinterdriver(&q_o, srv_name, level, info);
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
 
-       /* turn the data into an io stream */
-        if (spoolss_io_q_addprinterdriver("", &q_o, &buf, 0) &&
-           rpc_con_pipe_req(con, SPOOLSS_ADDPRINTERDRIVER, &buf, &rbuf)) 
-       {
-               ZERO_STRUCT(r_o);
+       for (i = 0; i < out.returned; i++) {
+               PRINTER_ENUM_VALUES *v = &out.ctr.values[i];
+               fstring name;
 
-               if(!spoolss_io_r_addprinterdriver("", &r_o, &rbuf, 0)) 
-               {
-                        /* report error code */
-                        DEBUG(5,("SPOOLSS_ADDPRINTEREX: %s\n", get_nt_error_msg(r_o.status)));
-               }
-        }
+               rpcstr_pull(name, v->valuename.buffer, sizeof(name), -1, 
+                           STR_TERMINATE);
+               regval_ctr_addvalue(ctr, name, v->type, (const char *)v->data, v->data_len);
+       }
+
+       return out.status;
+}
+
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_writeprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                               POLICY_HND *hnd, uint32 data_size, char *data,
+                               uint32 *num_written)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_WRITEPRINTER in;
+       SPOOL_R_WRITEPRINTER out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_writeprinter( &in, hnd, data_size, data );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_WRITEPRINTER,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_writeprinter,
+                   spoolss_io_r_writeprinter, 
+                   WERR_GENERAL_FAILURE );
+                   
+       if (num_written)
+               *num_written = out.buffer_written;
+               
+       return out.status;
+}
+
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_deleteprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                    POLICY_HND *hnd, char *valuename)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_DELETEPRINTERDATA in;
+       SPOOL_R_DELETEPRINTERDATA out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_deleteprinterdata( &in, hnd, valuename );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDATA,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_deleteprinterdata,
+                   spoolss_io_r_deleteprinterdata, 
+                   WERR_GENERAL_FAILURE );
+
+       return out.status;
+}
+
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_deleteprinterdataex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                      POLICY_HND *hnd, char *keyname, 
+                                      char *valuename)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_DELETEPRINTERDATAEX in;
+       SPOOL_R_DELETEPRINTERDATAEX out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_deleteprinterdataex( &in, hnd, keyname, valuename );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDATAEX, 
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_deleteprinterdataex,
+                   spoolss_io_r_deleteprinterdataex, 
+                   WERR_GENERAL_FAILURE );
+
+       return out.status;
+}
+
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                 POLICY_HND *hnd, const char *keyname,
+                                 uint16 **keylist, uint32 *len)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMPRINTERKEY in;
+       SPOOL_R_ENUMPRINTERKEY out;
+       uint32 offered = 0;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
+       make_spoolss_q_enumprinterkey( &in, hnd, keyname, offered );
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-       free_spool_driver_info_3(q_o.info.info_3);
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERKEY, 
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_enumprinterkey,
+                   spoolss_io_r_enumprinterkey, 
+                   WERR_GENERAL_FAILURE );
 
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+       if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) {
+               offered = out.needed;
                
-       return r_o.status;
+               ZERO_STRUCT(in);
+               ZERO_STRUCT(out);
+               
+               make_spoolss_q_enumprinterkey( &in, hnd, keyname, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERKEY, 
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumprinterkey,
+                           spoolss_io_r_enumprinterkey, 
+                           WERR_GENERAL_FAILURE );
+       }
 
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;      
+       
+       if (keylist) {
+               *keylist = SMB_MALLOC_ARRAY(uint16, out.keys.buf_len);
+               if (!*keylist) {
+                       return WERR_NOMEM;
+               }
+               memcpy(*keylist, out.keys.buffer, out.keys.buf_len * 2);
+               if (len)
+                       *len = out.keys.buf_len * 2;
+       }
+
+       return out.status;
 }
 
+/**********************************************************************
+**********************************************************************/
+
+WERROR rpccli_spoolss_deleteprinterkey(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                   POLICY_HND *hnd, char *keyname)
+{
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_DELETEPRINTERKEY in;
+       SPOOL_R_DELETEPRINTERKEY out;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+        make_spoolss_q_deleteprinterkey( &in, hnd, keyname );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERKEY, 
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_deleteprinterkey,
+                   spoolss_io_r_deleteprinterkey, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
+}
 
+/** @} **/