s3-spoolss: remove unused decode_printer_info_7.
[ira/wip.git] / source3 / rpc_client / cli_spoolss.c
index 5292569ed435ba2af3c066428b0ea1333e7ab8c1..4c1d57e063f85253b10bbfd5587ed396c9df0023 100644 (file)
 /*
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-2000,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
- *  Copyright (C) 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
 
-#include "includes.h"
-#include "rpc_parse.h"
-#include "nterr.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_CLI
-
-/****************************************************************************
-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;
-
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+   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.
 
-        prs_init(&buf, MAX_PDU_FRAG_LEN, ctx, MARSHALL);
-        prs_init(&rbuf, 0, ctx, UNMARSHALL);
+   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.
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
+   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.
 
-        DEBUG(5,("SPOOLSS Enum Printer Drivers (Server: %s Environment: %s level: %d)\n",
-                                srv_name, environment, level));
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-        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) &&
-            rpc_con_pipe_req(con, SPOOLSS_ENUMPRINTERDRIVERS, &buf, &rbuf)) 
-       {
-               prs_mem_free(&buf);
-               ZERO_STRUCT(r_o);
+#include "includes.h"
+#include "rpc_client.h"
 
-               prs_switch_type(&buffer->prs, UNMARSHALL);
-               prs_set_offset(&buffer->prs, 0);
-               r_o.buffer=buffer;
+/**********************************************************************
+ convencience wrapper around rpccli_spoolss_OpenPrinterEx
+**********************************************************************/
 
-               if(spoolss_io_r_enumprinterdrivers("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_ENUMPRINTERDRIVERS:  %s\n", nt_errstr(r_o.status)));
-                       }
-                       *needed=r_o.needed;
-                       *returned=r_o.returned;
-               }
+WERROR rpccli_spoolss_openprinter_ex(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    const char *printername,
+                                    uint32_t access_desired,
+                                    struct policy_handle *handle)
+{
+       NTSTATUS status;
+       WERROR werror;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       union spoolss_UserLevel userlevel;
+       struct spoolss_UserLevel1 level1;
+
+       ZERO_STRUCT(devmode_ctr);
+
+       level1.size     = 28;
+       level1.client   = talloc_asprintf(mem_ctx, "\\\\%s", global_myname());
+       W_ERROR_HAVE_NO_MEMORY(level1.client);
+       level1.user     = cli->auth->user_name;
+       level1.build    = 1381;
+       level1.major    = 2;
+       level1.minor    = 0;
+       level1.processor = 0;
+
+       userlevel.level1 = &level1;
+
+       status = rpccli_spoolss_OpenPrinterEx(cli, mem_ctx,
+                                             printername,
+                                             NULL,
+                                             devmode_ctr,
+                                             access_desired,
+                                             1, /* level */
+                                             userlevel,
+                                             handle,
+                                             &werror);
+
+       if (!W_ERROR_IS_OK(werror)) {
+               return werror;
        }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-
-        cli_connection_unlink(con);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
 
-        return r_o.status;
+       return WERR_OK;
 }
 
-/****************************************************************************
-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)
+/**********************************************************************
+ convencience wrapper around rpccli_spoolss_GetPrinterDriver2
+**********************************************************************/
+
+WERROR rpccli_spoolss_getprinterdriver2(struct rpc_pipe_client *cli,
+                                       TALLOC_CTX *mem_ctx,
+                                       struct policy_handle *handle,
+                                       const char *architecture,
+                                       uint32_t level,
+                                       uint32_t offered,
+                                       uint32_t client_major_version,
+                                       uint32_t client_minor_version,
+                                       union spoolss_DriverInfo *info,
+                                       uint32_t *server_major_version,
+                                       uint32_t *server_minor_version)
 {
-        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);
-
-        struct cli_connection *con = NULL;
-
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
-
-        prs_init(&buf, MAX_PDU_FRAG_LEN, ctx, MARSHALL);
-        prs_init(&rbuf, 0, ctx, UNMARSHALL);
-
-        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
-
-        DEBUG(5,("SPOOLSS Enum Printers (Server: %s level: %d)\n", srv_name, level));
-
-        make_spoolss_q_enumprinters(&q_o, flags, "", level, buffer, offered);
+       NTSTATUS status;
+       WERROR werror;
+       uint32_t needed;
+       DATA_BLOB buffer;
+
+       if (offered > 0) {
+               buffer = data_blob_talloc_zero(mem_ctx, offered);
+               W_ERROR_HAVE_NO_MEMORY(buffer.data);
+       }
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_enumprinters("", &q_o, &buf, 0) &&
-          rpc_con_pipe_req(con, SPOOLSS_ENUMPRINTERS, &buf, &rbuf)) 
-       {
-               ZERO_STRUCT(r_o);
+       status = rpccli_spoolss_GetPrinterDriver2(cli, mem_ctx,
+                                                 handle,
+                                                 architecture,
+                                                 level,
+                                                 (offered > 0) ? &buffer : NULL,
+                                                 offered,
+                                                 client_major_version,
+                                                 client_minor_version,
+                                                 info,
+                                                 &needed,
+                                                 server_major_version,
+                                                 server_minor_version,
+                                                 &werror);
+       if (W_ERROR_EQUAL(werror, WERR_INSUFFICIENT_BUFFER)) {
+               offered = needed;
+               buffer = data_blob_talloc_zero(mem_ctx, needed);
+               W_ERROR_HAVE_NO_MEMORY(buffer.data);
+
+               status = rpccli_spoolss_GetPrinterDriver2(cli, mem_ctx,
+                                                         handle,
+                                                         architecture,
+                                                         level,
+                                                         &buffer,
+                                                         offered,
+                                                         client_major_version,
+                                                         client_minor_version,
+                                                         info,
+                                                         &needed,
+                                                         server_major_version,
+                                                         server_minor_version,
+                                                         &werror);
+       }
 
-               prs_switch_type(&buffer->prs, UNMARSHALL);
-               prs_set_offset(&buffer->prs, 0);
-               r_o.buffer=buffer;
+       return werror;
+}
 
-               if(new_spoolss_io_r_enumprinters("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               /* report error code */
-                               DEBUG(3,("SPOOLSS_ENUMPRINTERS: %s\n", nt_errstr(r_o.status)));
-                       }
+/**********************************************************************
+ convencience wrapper around rpccli_spoolss_AddPrinterEx
+**********************************************************************/
 
-                       *needed=r_o.needed;
-                       *returned=r_o.returned;
-               }
+WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct spoolss_SetPrinterInfoCtr *info_ctr)
+{
+       WERROR result;
+       NTSTATUS status;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+       struct spoolss_UserLevelCtr userlevel_ctr;
+       struct spoolss_UserLevel1 level1;
+       struct policy_handle handle;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+
+       level1.size             = 28;
+       level1.build            = 1381;
+       level1.major            = 2;
+       level1.minor            = 0;
+       level1.processor        = 0;
+       level1.client           = talloc_asprintf(mem_ctx, "\\\\%s", global_myname());
+       W_ERROR_HAVE_NO_MEMORY(level1.client);
+       level1.user             = cli->auth->user_name;
+
+       userlevel_ctr.level = 1;
+       userlevel_ctr.user_info.level1 = &level1;
+
+       status = rpccli_spoolss_AddPrinterEx(cli, mem_ctx,
+                                            cli->srv_name_slash,
+                                            info_ctr,
+                                            &devmode_ctr,
+                                            &secdesc_ctr,
+                                            &userlevel_ctr,
+                                            &handle,
+                                            &result);
+       return result;
+}
 
-        }
+/**********************************************************************
+ convencience wrapper around rpccli_spoolss_GetPrinter
+**********************************************************************/
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+WERROR rpccli_spoolss_getprinter(struct rpc_pipe_client *cli,
+                                TALLOC_CTX *mem_ctx,
+                                struct policy_handle *handle,
+                                uint32_t level,
+                                uint32_t offered,
+                                union spoolss_PrinterInfo *info)
+{
+       NTSTATUS status;
+       WERROR werror;
+       DATA_BLOB buffer;
+       uint32_t needed;
+
+       if (offered > 0) {
+               buffer = data_blob_talloc_zero(mem_ctx, offered);
+               W_ERROR_HAVE_NO_MEMORY(buffer.data);
+       }
 
-        cli_connection_unlink(con);
+       status = rpccli_spoolss_GetPrinter(cli, mem_ctx,
+                                          handle,
+                                          level,
+                                          (offered > 0) ? &buffer : NULL,
+                                          offered,
+                                          info,
+                                          &needed,
+                                          &werror);
+
+       if (W_ERROR_EQUAL(werror, WERR_INSUFFICIENT_BUFFER)) {
+
+               offered = needed;
+               buffer = data_blob_talloc_zero(mem_ctx, offered);
+               W_ERROR_HAVE_NO_MEMORY(buffer.data);
+
+               status = rpccli_spoolss_GetPrinter(cli, mem_ctx,
+                                                  handle,
+                                                  level,
+                                                  &buffer,
+                                                  offered,
+                                                  info,
+                                                  &needed,
+                                                  &werror);
+       }
 
-        return r_o.status;
+       return werror;
 }
 
-/****************************************************************************
-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);
+/*********************************************************************
+ Decode various spoolss rpc's and info levels
+ ********************************************************************/
 
-        struct cli_connection *con = NULL;
+/**********************************************************************
+**********************************************************************/
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+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;
 
-        prs_init(&buf, MAX_PDU_FRAG_LEN, ctx, MARSHALL);
-        prs_init(&rbuf, 0, ctx, UNMARSHALL);
+       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;
+       }
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMPORTS */
+       prs_set_offset(&buffer->prs,0);
 
-        DEBUG(5,("SPOOLSS Enum Ports (Server: %s level: %d)\n", srv_name, level));
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_info_0("", buffer, &inf[i], 0)) {
+                       return False;
+               }
+       }
 
-        make_spoolss_q_enumports(&q_o, "", level, buffer, offered);
+       *info=inf;
+       return True;
+}
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_enumports("", &q_o, &buf, 0) &&
-            rpc_con_pipe_req(con, SPOOLSS_ENUMPORTS, &buf, &rbuf))
-       {
-               prs_mem_free(&buf );
-               ZERO_STRUCT(r_o);
+/**********************************************************************
+**********************************************************************/
 
-               prs_switch_type(&buffer->prs, UNMARSHALL);
-               prs_set_offset(&buffer->prs, 0);
-               r_o.buffer=buffer;
+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;
 
-               if(new_spoolss_io_r_enumports("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_ENUMPORTS: %s\n", nt_errstr(r_o.status)));
-                       }
-                       
-                       *needed=r_o.needed;
-                       *returned=r_o.returned;
+       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;
+       }
 
-        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;
+               }
+       }
 
-        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)
-{
-        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);
-
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
-
-        prs_init(&buf, MAX_PDU_FRAG_LEN, ctx, MARSHALL);
-        prs_init(&rbuf, 0, ctx, UNMARSHALL);
+/**********************************************************************
+**********************************************************************/
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
-
-        DEBUG(5,("SPOOLSS Enum Jobs level: %d)\n", level));
-
-        make_spoolss_q_enumjobs(&q_o, hnd, firstjob, numofjobs, level, buffer, offered);
+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;
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_enumjobs("", &q_o, &buf, 0) &&
-            rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMJOBS, &buf, &rbuf))
-        {
-               ZERO_STRUCT(r_o);
-               prs_mem_free(&buf );
+       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;
+       }
 
-               r_o.buffer=buffer;
+       prs_set_offset(&buffer->prs,0);
 
-               if(spoolss_io_r_enumjobs("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_ENUMJOBS: %s\n", nt_errstr(r_o.status)));
-                       }
-                       *needed=r_o.needed;
-                       *returned=r_o.returned;
+       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;
                }
        }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-
-        return r_o.status;
+       *info=inf;
+       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_printer_info_3(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                               uint32 returned, PRINTER_INFO_3 **info)
 {
-        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;
+       PRINTER_INFO_3  *inf;
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
+       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;
        }
-        prs_init(&buf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-        /* create and send a MSRPC command with api  SPOOLSS_ENUMPRINTERDATA*/
 
-        DEBUG(4,("SPOOLSS Enum Printer data\n"));
+       prs_set_offset(&buffer->prs,0);
 
-        make_spoolss_q_enumprinterdata(&q_o, hnd, idx, *valuelen, *datalen);
+       for (i=0; i<returned; i++) {
+               inf[i].secdesc = NULL;
+               if (!smb_io_printer_info_3("", buffer, &inf[i], 0)) {
+                       return False;
+               }
+       }
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_enumprinterdata("", &q_o, &buf, 0) &&
-            rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMPRINTERDATA, &buf, &rbuf)) 
-       {
-               ZERO_STRUCT(r_o);
-               prs_mem_free(&buf );
+       *info=inf;
+       return True;
+}
 
-               r_o.data=data;
-               r_o.value=value;
+/**********************************************************************
+**********************************************************************/
 
-               if(spoolss_io_r_enumprinterdata("", &r_o, &rbuf, 0))
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_ENUMPRINTERDATA: %s\n", nt_errstr(r_o.status)));
-                       }
-                       
-                       *valuelen=r_o.valuesize;
-                       *rvaluelen=r_o.realvaluesize;
-                       *type=r_o.type;
-                       *datalen=r_o.datasize;
-                       *rdatalen=r_o.realdatasize;
+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;
 
+       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 );
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+       prs_set_offset(&buffer->prs, 0);
+
+       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 printer datas
-****************************************************************************/
-uint32 spoolss_getprinter(const POLICY_HND *hnd, uint32 level,
-                             NEW_BUFFER *buffer, uint32 offered,
-                             uint32 *needed)
-{
-        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);
+/**********************************************************************
+**********************************************************************/
 
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+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;
 
-        prs_init(&buf, MAX_PDU_FRAG_LEN, ctx, MARSHALL);
-        prs_init(&rbuf, 0, ctx, UNMARSHALL);
+       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;
+       }
 
-        /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+       prs_set_offset(&buffer->prs, 0);
 
-        DEBUG(5,("SPOOLSS Enum Printer data)\n"));
+       for (i=0; i<returned; i++) {
+               if (!smb_io_port_info_2("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        make_spoolss_q_getprinter(&q_o, hnd, level, buffer, offered);
+       *info=inf;
+       return True;
+}
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_getprinter("", &q_o, &buf, 0) &&
-             rpc_hnd_pipe_req(hnd, SPOOLSS_GETPRINTER, &buf, &rbuf)) 
-       {
-               ZERO_STRUCT(r_o);
-               prs_mem_free(&buf );
+/**********************************************************************
+**********************************************************************/
 
-               prs_switch_type(&buffer->prs, UNMARSHALL);
-               prs_set_offset(&buffer->prs, 0);
-               r_o.buffer=buffer;
+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;
 
-               if(!spoolss_io_r_getprinter("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_GETPRINTER: %s\n", nt_errstr(r_o.status)));
-                       }
-                       *needed=r_o.needed;
+       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;
        }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       prs_set_offset(&buffer->prs,0);
+
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_driver_info_1("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        return r_o.status;
+       *info=inf;
+       return True;
 }
 
-/****************************************************************************
-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)
+/**********************************************************************
+**********************************************************************/
+
+static bool decode_printer_driver_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                       uint32 returned, DRIVER_INFO_2 **info)
 {
-        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);
+       uint32 i;
+       DRIVER_INFO_2 *inf;
 
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+       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_init(&buf, MAX_PDU_FRAG_LEN, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 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_2("", buffer, &(inf[i]), 0)) {
+                       return False;
+               }
+       }
 
-        DEBUG(5,("SPOOLSS Enum Printer driver)\n"));
+       *info=inf;
+       return True;
+}
 
-        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) &&
-            rpc_hnd_pipe_req(hnd, SPOOLSS_GETPRINTERDRIVER2, &buf, &rbuf)) 
-       {
-               ZERO_STRUCT(r_o);
-               prs_mem_free(&buf );
+static bool decode_printer_driver_3(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                       uint32 returned, DRIVER_INFO_3 **info)
+{
+       uint32 i;
+       DRIVER_INFO_3 *inf;
 
-               prs_switch_type(&buffer->prs, UNMARSHALL);
-               prs_set_offset(&buffer->prs, 0);
-               r_o.buffer=buffer;
+       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;
+       }
 
-               if(spoolss_io_r_getprinterdriver2("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_GETPRINTERDRIVER2: %s\n", nt_errstr(r_o.status)));
-                       }
+       prs_set_offset(&buffer->prs,0);
 
-                       *needed=r_o.needed;
+       for (i=0; i<returned; i++) {
+               if (!smb_io_printer_driver_info_3("", buffer, &(inf[i]), 0)) {
+                       return False;
                }
        }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-
-        return r_o.status;
+       *info=inf;
+       return True;
 }
 
+/**********************************************************************
+**********************************************************************/
 
-
-/****************************************************************************
-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)
+static bool decode_jobs_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                         uint32 num_jobs, JOB_INFO_1 **jobs)
 {
-        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;
-       
-        memset(srv_name, 0, sizeof(srv_name));
-        fstrcpy(srv_name, printername);
-
-        s = strchr_m(&srv_name[2], '\\');
-       if (s != NULL)
-               *s = '\0';
+       uint32 i;
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
-
-        if (hnd == NULL) 
-               return False;
+       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);
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
+       for (i = 0; i < num_jobs; i++) {
+               if (!smb_io_job_info_1("", buffer, &((*jobs)[i]), 0)) {
+                       return False;
+               }
        }
-        prs_init(&buf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-        /* create and send a MSRPC command with api SPOOLSS_OPENPRINTEREX */
+       return True;
+}
 
-        DEBUG(5,("SPOOLSS Open Printer Ex\n"));
+/**********************************************************************
+**********************************************************************/
 
-        make_spoolss_q_open_printer_ex(&q_o, printername, datatype,
-                                       access_required, station, username);
+static bool decode_jobs_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, 
+                         uint32 num_jobs, JOB_INFO_2 **jobs)
+{
+       uint32 i;
 
-        /* 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;
+       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);
 
-                spoolss_io_r_open_printer_ex("", &r_o, &rbuf, 0);
+       for (i = 0; i < num_jobs; i++) {
+               if (!smb_io_job_info_2("", buffer, &((*jobs)[i]), 0)) {
+                       return False;
+               }
+       }
 
-                if (prs_offset(&rbuf)!= 0 && r_o.status != 0)
-                {
-                        /* report error code */
-                        DEBUG(3,("SPOOLSS_OPENPRINTEREX: %s\n", nt_errstr(r_o.status)));
-                        p = False;
-                }
+       return True;
+}
 
-                if (p)
-                {
-                        /* ok, at last: we're happy. return the policy handle */
-                        *hnd = r_o.handle;
+/**********************************************************************
+**********************************************************************/
 
-                       /* associate the handle returned with the current 
-                          state of the clienjt connection */
-                       valid_pol = RpcHndList_set_connection(hnd, con);
+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;
+       }
+
+       prs_set_offset(&buffer->prs,0);
 
-       prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+       for (i = 0; i < num_forms; i++) {
+               if (!smb_io_form_1("", buffer, &((*forms)[i]), 0)) {
+                       return False;
+               }
+       }
 
-        return valid_pol;
+       return True;
 }
 
-/****************************************************************************
- 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_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 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 the_client_name;
-       BOOL valid_pol = True;
+       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;
+       if (!rpcbuf_init(&buffer, offered, mem_ctx))
+               return WERR_NOMEM;
+       make_spoolss_q_enumprinters( &in, flags, name, level, &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_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);
+
+               if (!rpcbuf_init(&buffer, offered, mem_ctx))
+                       return WERR_NOMEM;
+               make_spoolss_q_enumprinters( &in, flags, name, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ENUMPRINTERS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumprinters,
+                           spoolss_io_r_enumprinters, 
+                           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, 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;
+       }                       
 
+       *num_printers = out.returned;
 
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return NT_STATUS_ACCESS_DENIED;
+       return out.status;
+}
 
-        if (hnd == NULL)
-               return NT_STATUS_INVALID_PARAMETER;
+/**********************************************************************
+**********************************************************************/
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("spoolss_addprinterex: talloc_init() failed!\n"));
-               return NT_STATUS_ACCESS_DENIED;
+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->desthost);
+        strupper_m(server);
+
+       offered = 0;
+       if (!rpcbuf_init(&buffer, offered, mem_ctx))
+               return WERR_NOMEM;
+       make_spoolss_q_enumports( &in, server, level, &buffer, offered );
+       
+       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_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);
+               
+               if (!rpcbuf_init(&buffer, offered, mem_ctx))
+                       return WERR_NOMEM;
+               make_spoolss_q_enumports( &in, server, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ENUMPORTS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumports,
+                           spoolss_io_r_enumports, 
+                           WERR_GENERAL_FAILURE );
        }
-        prs_init(&buf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-        /* create and send a MSRPC command with api SPOOLSS_ENUMPORTS */
-        DEBUG(5,("SPOOLSS Add Printer Ex (Server: %s)\n", srv_name));
        
-        fstrcpy(the_client_name, "\\\\");
-        fstrcat(the_client_name, con->pCli_state->desthost);
-        strupper(the_client_name);
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
        
-
-        make_spoolss_q_addprinterex(mem_ctx, &q_o, srv_name, the_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_OK)
-                        {
-                               /* report error code */
-                               DEBUG(3,("SPOOLSS_ADDPRINTEREX: %s\n", nt_errstr(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);
+       switch (level) {
+       case 1:
+               if (!decode_port_info_1(mem_ctx, out.buffer, out.returned, &ctr->port.info_1)) {
+                       return WERR_GENERAL_FAILURE;
                }
-        }
-
-
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+               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;
+       }
 
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+       *num_ports = out.returned;
 
-        return valid_pol;
+       return out.status;
 }
 
-/****************************************************************************
-do a SPOOL Close
-****************************************************************************/
-BOOL spoolss_closeprinter(POLICY_HND *hnd)
+/**********************************************************************
+**********************************************************************/
+
+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 rbuf;
-        prs_struct buf;
-        SPOOL_Q_CLOSEPRINTER q_c;
-        BOOL valid_close = False;
-       TALLOC_CTX *mem_ctx = NULL;
+       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->desthost);
+        strupper_m(server);
+
+       offered = 0;
+       if (!rpcbuf_init(&buffer, offered, mem_ctx))
+               return WERR_NOMEM;
+       make_spoolss_q_enumprinterdrivers( &in, server, env, level, 
+               &buffer, offered);
        
-        if (hnd == NULL) 
-               return False;
-
-        /* 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;
+       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_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);
+               
+               if (!rpcbuf_init(&buffer, offered, mem_ctx))
+                       return WERR_NOMEM;
+               make_spoolss_q_enumprinterdrivers( &in, server, env, level, 
+                       &buffer, offered);
+       
+               CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ENUMPRINTERDRIVERS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumprinterdrivers,
+                           spoolss_io_r_enumprinterdrivers, 
+                           WERR_GENERAL_FAILURE );
        }
-        prs_init(&buf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+       
+       *num_drivers = out.returned;
 
-        DEBUG(4,("SPOOL Close Printer\n"));
+       if ( !W_ERROR_IS_OK(out.status) )
+               return out.status;
+               
+       if ( out.returned ) {
 
-        /* store the parameters */
-        make_spoolss_q_closeprinter(&q_c, hnd);
+               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;
+               }
+       }
 
-        /* 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;
+       return out.status;
+}
 
-                spoolss_io_r_closeprinter("", &r_c, &rbuf, 0);
+/**********************************************************************
+**********************************************************************/
 
-                if (prs_offset(&rbuf)!=0 && r_c.status != 0)
-                {
-                        /* report error code */
-                        DEBUG(3,("SPOOL_CLOSEPRINTER: %s\n", nt_errstr(r_c.status)));
-                }
-               else
-                       valid_close = True;
-        }
+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;
+       if (!rpcbuf_init(&buffer, offered, mem_ctx))
+               return WERR_NOMEM;
+       make_spoolss_q_enumforms( &in, handle, level, &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_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);
+
+               if (!rpcbuf_init(&buffer, offered, mem_ctx))
+                       return WERR_NOMEM;
+               make_spoolss_q_enumforms( &in, handle, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ENUMFORMS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumforms,
+                           spoolss_io_r_enumforms, 
+                           WERR_GENERAL_FAILURE );
+       }
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
 
-       /* disassociate with the cli_connection */
-        RpcHndList_del_connection(hnd);
+       *num_forms = out.numofforms;
+       
+       if (!decode_forms_1(mem_ctx, out.buffer, *num_forms, forms)) {
+               return WERR_GENERAL_FAILURE;
+       }
 
-        return valid_close;
+       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)
-{
-        prs_struct rbuf;
-        prs_struct buf;
-        SPOOL_Q_GETPRINTERDATA q_o;
-        SPOOL_R_GETPRINTERDATA r_o;
-       TALLOC_CTX *mem_ctx = NULL;
-
-        if (hnd == NULL)
-                return NT_STATUS_INVALID_PARAMETER;
+/**********************************************************************
+**********************************************************************/
 
-       if ((mem_ctx=talloc_init()) == NULL)
-       {
-               DEBUG(0,("msrpc_spoolss_enum_jobs: talloc_init failed!\n"));
-               return False;
+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;
+       if (!rpcbuf_init(&buffer, offered, mem_ctx))
+               return WERR_NOMEM;
+       make_spoolss_q_enumjobs( &in, hnd, firstjob, num_jobs, level, 
+               &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_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);
+
+               if (!rpcbuf_init(&buffer, offered, mem_ctx))
+                       return WERR_NOMEM;
+               make_spoolss_q_enumjobs( &in, hnd, firstjob, num_jobs, level, 
+                       &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ENUMJOBS,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumjobs,
+                           spoolss_io_r_enumjobs, 
+                           WERR_GENERAL_FAILURE );
        }
-        prs_init(&buf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-        /* create and send a MSRPC command with api SPOOLSS_GETPRINTERDATA */
 
-        DEBUG(5,("SPOOLSS Get Printer data)\n"));
+       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;
 
-        make_spoolss_q_getprinterdata(&q_o, hnd,(UNISTR2 *)valuename, in_size);
+       return out.status;
+}
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_getprinterdata("", &q_o, &buf, 0) &&
-             rpc_hnd_pipe_req(hnd, SPOOLSS_GETPRINTERDATA, &buf, &rbuf)) 
-       {
-               ZERO_STRUCT(r_o);
-               prs_mem_free(&buf );
+/**********************************************************************
+**********************************************************************/
 
-               r_o.data=data;
+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 qbuf, rbuf;
+       SPOOL_Q_GETJOB in;
+       SPOOL_R_GETJOB out;
+       RPC_BUFFER buffer;
+       uint32 offered;
+
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
+
+       offered = 0;
+       if (!rpcbuf_init(&buffer, offered, mem_ctx))
+               return WERR_NOMEM;
+       make_spoolss_q_getjob( &in, hnd, jobid, level, &buffer, offered );
+
+       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_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);
+               
+               if (!rpcbuf_init(&buffer, offered, mem_ctx))
+                       return WERR_NOMEM;
+               make_spoolss_q_getjob( &in, hnd, jobid, level, &buffer, offered );
+
+               CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_GETJOB,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_getjob,
+                           spoolss_io_r_getjob, 
+                           WERR_GENERAL_FAILURE );
+       }
 
-               if(spoolss_io_r_getprinterdata("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_GETPRINTERDATA: %s\n", nt_errstr(r_o.status)));
-                       }
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
 
-                       *type=r_o.type;
-                       *out_size=r_o.size;
-                       *needed=r_o.needed;
+       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_mem_free(&rbuf);
-        prs_mem_free(&buf );
-
-        return r_o.status;
+       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, &syntax_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, &syntax_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, ctx, MARSHALL);
-        prs_init(&rbuf, 0, 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_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, &syntax_spoolss, SPOOLSS_SETPRINTERDATA,
+                   in, out, 
+                   qbuf, rbuf,
+                   spoolss_io_q_setprinterdata,
+                   spoolss_io_r_setprinterdata, 
+                   WERR_GENERAL_FAILURE );
+                   
+       return out.status;
+}
 
-        /* turn parameters into data stream */
-        if (spoolss_io_q_getprinterdriverdir("", &q_o, &buf, 0) &&
-             rpc_con_pipe_req(con, SPOOLSS_GETPRINTERDRIVERDIRECTORY, &buf, &rbuf)) 
-       {
-               prs_mem_free(&buf );
-               ZERO_STRUCT(r_o);
+/**********************************************************************
+**********************************************************************/
 
-               prs_switch_type(&buffer->prs, UNMARSHALL);
-               prs_set_offset(&buffer->prs, 0);
-               r_o.buffer=buffer;
+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 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, &syntax_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;
+       }
+       
+       return out.status;
+}
 
-               if(spoolss_io_r_getprinterdriverdir("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               DEBUG(3,("SPOOLSS_GETPRINTERDRIVERDIRECTORY: %s\n", nt_errstr(r_o.status)));
-                       }
+/**********************************************************************
+**********************************************************************/
 
-                       *needed=r_o.needed;
-               }
+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, &syntax_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, &syntax_spoolss, SPOOLSS_ENUMPRINTERDATAEX,
+                           in, out, 
+                           qbuf, rbuf,
+                           spoolss_io_q_enumprinterdataex,
+                           spoolss_io_r_enumprinterdataex, 
+                           WERR_GENERAL_FAILURE );
        }
+       
+       if (!W_ERROR_IS_OK(out.status))
+               return out.status;
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       for (i = 0; i < out.returned; i++) {
+               PRINTER_ENUM_VALUES *v = &out.ctr.values[i];
+               fstring name;
 
-        cli_connection_unlink(con);
+               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 r_o.status;
+       return out.status;
 }
 
-/******************************************************************************
- AddPrinterDriver()
- *****************************************************************************/
-uint32 spoolss_addprinterdriver(const char *srv_name, uint32 level, PRINTER_DRIVER_CTR *info)
+/**********************************************************************
+**********************************************************************/
+
+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                     rbuf;
-        prs_struct                     buf;
-        SPOOL_Q_ADDPRINTERDRIVER       q_o;
-        SPOOL_R_ADDPRINTERDRIVER       r_o;
-       TALLOC_CTX                      *mem_ctx = NULL;
-       struct cli_connection           *con = NULL;
-       
-        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
-                return False;
+       prs_struct qbuf, rbuf;
+       SPOOL_Q_ENUMPRINTERKEY in;
+       SPOOL_R_ENUMPRINTERKEY out;
+       uint32 offered = 0;
 
-       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, mem_ctx, MARSHALL);
-        prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-       
-       /* make the ADDPRINTERDRIVER PDU */
-       make_spoolss_q_addprinterdriver(mem_ctx, &q_o, srv_name, level, info);
-
-       /* 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);
-
-               if(spoolss_io_r_addprinterdriver("", &r_o, &rbuf, 0)) 
-               {
-                       if (r_o.status != NT_STATUS_OK)
-                       {
-                               /* report error code */
-                               DEBUG(3,("SPOOLSS_ADDPRINTERDRIVER: %s\n", nt_errstr(r_o.status)));
-                       }
-               }
-        }
+       ZERO_STRUCT(in);
+       ZERO_STRUCT(out);
 
+       make_spoolss_q_enumprinterkey( &in, hnd, keyname, offered );
 
-        prs_mem_free(&rbuf);
-        prs_mem_free(&buf );
+       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_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, &syntax_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;
 }
+/** @} **/