Herb's warning fixes. Also the POSIX locking fix.
[samba.git] / source / rpc_client / cli_spoolss.c
index 2b620f036e94bc98846413e5c82b1be3ee6fd6e7..3517fbbc9c8fddea13772cf08f38c335f5fa7c56 100644 (file)
-
-/* 
+/*
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
  *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997.
- *  
+ *  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.
  */
 
-
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
-
 #include "includes.h"
+#include "rpc_parse.h"
+#include "rpc_client.h"
+#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
-
 /****************************************************************************
-do a SPOOLSS Enum Printers
+do a SPOOLSS Enum Printer Drivers
 ****************************************************************************/
-BOOL spoolss_enum_printers(uint32 flags, const char *srv_name,
-                       uint32 level,
-                       uint32 *count,
-                       void ***printers)
+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_ENUMPRINTERS q_o;
-       BOOL valid_pol = False;
+        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;
+        struct cli_connection *con = NULL;
+
+        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+                return False;
 
-       if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
+        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+
+        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
+
+        DEBUG(5,("SPOOLSS Enum Printer Drivers (Server: %s Environment: %s level: %d)\n",
+                                srv_name, environment, level));
+
+        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)) 
        {
-               return False;
+               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_enumprinterdrivers("", &r_o, &rbuf, 0)) 
+               {
+                       if (r_o.status != NT_STATUS_NOPROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_ENUMPRINTERDRIVERS:  %s\n", get_nt_error_msg(r_o.status)));
+                       }
+                       *needed=r_o.needed;
+                       *returned=r_o.returned;
+               }
        }
 
-       if (count == NULL || printers == NULL) return False;
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
 
-       prs_init(&buf , 1024, 4, SAFETY_MARGIN, False);
-       prs_init(&rbuf, 0   , 4, SAFETY_MARGIN, True );
+        cli_connection_unlink(con);
 
-       /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
+        return r_o.status;
+}
 
-       DEBUG(5,("SPOOLSS Enum Printers (Server: %s level: %d)\n",
-                               srv_name, level));
+/****************************************************************************
+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)
+{
+        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);
 
-       make_spoolss_q_enumprinters(&q_o, flags, srv_name, level, 0x50);
+        struct cli_connection *con = NULL;
 
-       /* turn parameters into data stream */
-       spoolss_io_q_enumprinters("", &q_o, &buf, 0);
+        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+                return False;
 
-       /* send the data on \PIPE\ */
-       if (rpc_con_pipe_req(con, SPOOLSS_ENUMPRINTERS, &buf, &rbuf))
-       {
-               SPOOL_R_ENUMPRINTERS r_o;
-               BOOL p;
+        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
+        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
 
-               ZERO_STRUCT(r_o);
+        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
 
-               r_o.level = level; /* i can't believe you have to this */
+        DEBUG(5,("SPOOLSS Enum Printers (Server: %s level: %d)\n", srv_name, level));
+
+        make_spoolss_q_enumprinters(&q_o, flags, "", level, buffer, offered);
+
+        /* 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);
 
-               spoolss_io_r_enumprinters("", &r_o, &rbuf, 0);
-               p = rbuf.offset != 0;
+               prs_switch_type(&buffer->prs, UNMARSHALL);
+               prs_set_offset(&buffer->prs, 0);
+               r_o.buffer=buffer;
 
-               if (p && r_o.status != 0)
+               if(new_spoolss_io_r_enumprinters("", &r_o, &rbuf, 0)) 
                {
-                       /* report error code */
-                       DEBUG(5,("SPOOLSS_ENUM_PRINTERS: %s\n", get_nt_error_msg(r_o.status)));
-                       p = False;
-               }
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               /* report error code */
+                               DEBUG(3,("SPOOLSS_ENUMPRINTERS: %s\n", get_nt_error_msg(r_o.status)));
+                       }
+
+                       *needed=r_o.needed;
+                       *returned=r_o.returned;
+               }
+
+        }
+
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
+
+        cli_connection_unlink(con);
+
+        return r_o.status;
+}
+
+/****************************************************************************
+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);
 
-               if (p)
+        struct cli_connection *con = NULL;
+
+        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+                return False;
+
+        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
+        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+
+        /* create and send a MSRPC command with api SPOOLSS_ENUMPORTS */
+
+        DEBUG(5,("SPOOLSS Enum Ports (Server: %s level: %d)\n", srv_name, level));
+
+        make_spoolss_q_enumports(&q_o, "", level, buffer, offered);
+
+        /* 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;
+
+               if(new_spoolss_io_r_enumports("", &r_o, &rbuf, 0)) 
                {
-                       /* ok, at last: we're happy. return the policy handle */
-                       (*count) = r_o.returned;
-                       (*printers) = r_o.printer.info;
-                       valid_pol = True;
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_ENUMPORTS: %s\n", get_nt_error_msg(r_o.status)));
+                       }
+                       
+                       *needed=r_o.needed;
+                       *returned=r_o.returned;
                }
-       }
+        }
 
-       prs_mem_free(&rbuf);
-       prs_mem_free(&buf );
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
 
-       cli_connection_unlink(con);
+        cli_connection_unlink(con);
 
-       return valid_pol;
+        return r_o.status;
 }
 
 /****************************************************************************
 do a SPOOLSS Enum Jobs
 ****************************************************************************/
-uint32 spoolss_enum_jobs( const POLICY_HND *hnd,
-                       uint32 firstjob,
-                       uint32 numofjobs,
-                       uint32 level,
-                       uint32 *buf_size,
-                       uint32 *count,
-                       void ***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;
-       uint32 status = 0x0;
+        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 || count == NULL || jobs == NULL)
-       {
-               return NT_STATUS_INVALID_PARAMETER;
+        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);
+
+        /* 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);
+
+        /* 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 );
+
+               r_o.buffer=buffer;
+
+               if(spoolss_io_r_enumjobs("", &r_o, &rbuf, 0)) 
+               {
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_ENUMJOBS: %s\n", get_nt_error_msg(r_o.status)));
+                       }
+                       *needed=r_o.needed;
+                       *returned=r_o.returned;
+               }
        }
 
-       prs_init(&buf , 1024, 4, SAFETY_MARGIN, False);
-       prs_init(&rbuf, 0   , 4, SAFETY_MARGIN, True );
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
 
-       /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+        return r_o.status;
+}
+
+/***************************************************************************
+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)
+{
+        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;
+
+       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);
 
-       DEBUG(5,("SPOOLSS Enum Jobs level: %d)\n", level));
+        /* create and send a MSRPC command with api  SPOOLSS_ENUMPRINTERDATA*/
 
-       make_spoolss_q_enumjobs(&q_o, hnd,
-                       firstjob, numofjobs,
-                       level, *buf_size);
+        DEBUG(4,("SPOOLSS Enum Printer data\n"));
 
-       /* turn parameters into data stream */
-       spoolss_io_q_enumjobs("", &q_o, &buf, 0);
+        make_spoolss_q_enumprinterdata(&q_o, hnd, idx, *valuelen, *datalen);
 
-       /* send the data on \PIPE\ */
-       if (rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMJOBS, &buf, &rbuf))
+        /* turn parameters into data stream */
+        if (spoolss_io_q_enumprinterdata("", &q_o, &buf, 0) &&
+            rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMPRINTERDATA, &buf, &rbuf)) 
        {
-               SPOOL_R_ENUMJOBS r_o;
-               BOOL p;
+               ZERO_STRUCT(r_o);
+               prs_mem_free(&buf );
 
-               ZERO_STRUCT(r_o);
+               r_o.data=data;
+               r_o.value=value;
 
-               r_o.level = level; /* i can't believe you have to this */
+               if(spoolss_io_r_enumprinterdata("", &r_o, &rbuf, 0))
+               {
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_ENUMPRINTERDATA: %s\n", get_nt_error_msg(r_o.status)));
+                       }
+                       
+                       *valuelen=r_o.valuesize;
+                       *rvaluelen=r_o.realvaluesize;
+                       *type=r_o.type;
+                       *datalen=r_o.datasize;
+                       *rdatalen=r_o.realdatasize;
 
-               spoolss_io_r_enumjobs("", &r_o, &rbuf, 0);
-               p = rbuf.offset != 0;
+               }
+       }
 
-               status = r_o.status;
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
+       if (mem_ctx)
+               talloc_destroy(mem_ctx);
 
-               if (p && r_o.status != 0)
+        return r_o.status;
+}
+
+/****************************************************************************
+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;
+
+        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
+        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
+
+        /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+
+        DEBUG(5,("SPOOLSS Enum Printer data)\n"));
+
+        make_spoolss_q_getprinter(&q_o, hnd, level, buffer, offered);
+
+        /* 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;
+
+               if(!spoolss_io_r_getprinter("", &r_o, &rbuf, 0)) 
                {
-                       /* report error code */
-                       DEBUG(5,("SPOOLSS_ENUM_JOBS: %s\n", get_nt_error_msg(r_o.status)));
-                       p = status = ERROR_INSUFFICIENT_BUFFER;
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_GETPRINTER: %s\n", get_nt_error_msg(r_o.status)));
+                       }
+                       *needed=r_o.needed;
                }
+       }
+
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
+
+        return r_o.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)
+{
+        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);
+
+        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);
 
-               if (p)
+        /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+
+        DEBUG(5,("SPOOLSS Enum Printer driver)\n"));
+
+        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 );
+
+               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)) 
                {
-                       /* ok, at last: we're happy. return the policy handle */
-                       (*count) = r_o.numofjobs;
-                       (*jobs) = r_o.job.info;
-                       (*buf_size) = r_o.offered;
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_GETPRINTERDRIVER2: %s\n", get_nt_error_msg(r_o.status)));
+                       }
+
+                       *needed=r_o.needed;
                }
        }
 
-       prs_mem_free(&rbuf);
-       prs_mem_free(&buf );
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
 
-       return status;
+        return r_o.status;
 }
 
+
+
 /****************************************************************************
 do a SPOOLSS Open Printer Ex
 ****************************************************************************/
-BOOL spoolss_open_printer_ex( const char *printername,
-                       uint32 cbbuf, uint32 devmod, uint32 des_access,
-                       const char *station, const char *username,
-                       POLICY_HND *hnd)
+BOOL spoolss_open_printer_ex(  const char *printername,
+                         const char *datatype, uint32 access_required,
+                         const char *station,  const char *username,
+                        POLICY_HND *hnd)
 {
-       prs_struct rbuf;
-       prs_struct buf; 
-       SPOOL_Q_OPEN_PRINTER_EX q_o;
-       BOOL valid_pol = False;
-       fstring srv_name;
-       char *s;
+        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(&srv_name[2], '\\');
+       if (s != NULL)
+               *s = '\0';
+
+        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+                return False;
+
+        if (hnd == NULL) 
+               return False;
+
+       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);
+
+        /* create and send a MSRPC command with api SPOOLSS_OPENPRINTEREX */
+
+        DEBUG(5,("SPOOLSS Open Printer Ex\n"));
+
+        make_spoolss_q_open_printer_ex(&q_o, printername, datatype,
+                                       access_required, station, username);
+
+        /* 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;
+
+                spoolss_io_r_open_printer_ex("", &r_o, &rbuf, 0);
+
+                if (prs_offset(&rbuf)!= 0 && r_o.status != 0)
+                {
+                        /* report error code */
+                        DEBUG(3,("SPOOLSS_OPENPRINTEREX: %s\n", get_nt_error_msg(r_o.status)));
+                        p = False;
+                }
 
+                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);
+
+                }
+        }
+
+       prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
+       if (mem_ctx)
+               talloc_destroy(mem_ctx);
+
+        return valid_pol;
+}
+
+/****************************************************************************
+ 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)
+{
+        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;
 
-       memset(srv_name, 0, sizeof(srv_name));
-       fstrcpy(srv_name, printername);
 
-       s = strchr(&srv_name[2], '\\');
 
-       if (s != NULL)
+        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+                return NT_STATUS_ACCESS_DENIED;
+
+        if (hnd == NULL)
+               return NT_STATUS_INVALID_PARAMETER;
+
+       if ((mem_ctx=talloc_init()) == NULL)
        {
-               *s = 0;
+               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);
+
+        /* 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);
+       
+
+        make_spoolss_q_addprinterex(&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_NO_PROBLEMO)
+                        {
+                               /* report error code */
+                               DEBUG(3,("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);
+               }
+        }
+
+
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
+       free_spoolss_q_addprinterex(&q_o);
+
+       if (mem_ctx)
+               talloc_destroy(mem_ctx);
+
+        return valid_pol;
+}
 
-       if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+/****************************************************************************
+do a SPOOL Close
+****************************************************************************/
+BOOL spoolss_closeprinter(POLICY_HND *hnd)
+{
+        prs_struct rbuf;
+        prs_struct buf;
+        SPOOL_Q_CLOSEPRINTER q_c;
+        BOOL valid_close = False;
+       TALLOC_CTX *mem_ctx = NULL;
+       
+        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;
        }
+        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"));
+
+        /* store the parameters */
+        make_spoolss_q_closeprinter(&q_c, hnd);
 
-       if (hnd == NULL) return False;
+        /* 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);
+
+                if (prs_offset(&rbuf)!=0 && r_c.status != 0)
+                {
+                        /* report error code */
+                        DEBUG(3,("SPOOL_CLOSEPRINTER: %s\n", get_nt_error_msg(r_c.status)));
+                }
+               else
+                       valid_close = True;
+        }
 
-       prs_init(&buf , 1024, 4, SAFETY_MARGIN, False);
-       prs_init(&rbuf, 0   , 4, SAFETY_MARGIN, True );
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
+       if (mem_ctx)
+               talloc_destroy(mem_ctx);
 
-       /* create and send a MSRPC command with api SPOOLSS_OPENPRINTEREX */
+       /* disassociate with the cli_connection */
+        RpcHndList_del_connection(hnd);
 
-       DEBUG(5,("SPOOLSS Open Printer Ex\n"));
+        return valid_close;
+}
 
-       make_spoolss_q_open_printer_ex(&q_o, printername,
-                                      cbbuf, devmod, des_access,
-                                      station, username);
+/****************************************************************************
+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;
 
-       /* turn parameters into data stream */
-       spoolss_io_q_open_printer_ex("", &q_o, &buf, 0);
+        if (hnd == NULL)
+                return NT_STATUS_INVALID_PARAMETER;
 
-       /* send the data on \PIPE\ */
-       if (rpc_con_pipe_req(con, SPOOLSS_OPENPRINTEREX, &buf, &rbuf))
+       if ((mem_ctx=talloc_init()) == NULL)
        {
-               SPOOL_R_OPEN_PRINTER_EX r_o;
-               BOOL p;
+               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);
 
-               spoolss_io_r_open_printer_ex("", &r_o, &rbuf, 0);
-               p = rbuf.offset != 0;
+        /* create and send a MSRPC command with api SPOOLSS_GETPRINTERDATA */
 
-               if (p && r_o.status != 0)
-               {
-                       /* report error code */
-                       DEBUG(5,("SPOOLSS_OPENPRINTEREX: %s\n", get_nt_error_msg(r_o.status)));
-                       p = False;
-               }
+        DEBUG(5,("SPOOLSS Get Printer data)\n"));
+
+        make_spoolss_q_getprinterdata(&q_o, hnd,(UNISTR2 *)valuename, in_size);
+
+        /* 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;
 
-               if (p)
+               if(spoolss_io_r_getprinterdata("", &r_o, &rbuf, 0)) 
                {
-                       /* ok, at last: we're happy. return the policy handle */
-                       memcpy(hnd, r_o.handle.data, sizeof(hnd->data));
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_GETPRINTERDATA: %s\n", get_nt_error_msg(r_o.status)));
+                       }
 
-                       valid_pol = register_policy_hnd(hnd) &&
-                                           set_policy_con(hnd, con, 
-                                               cli_connection_unlink);
+                       *type=r_o.type;
+                       *out_size=r_o.size;
+                       *needed=r_o.needed;
                }
        }
 
-       prs_mem_free(&rbuf);
-       prs_mem_free(&buf );
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
 
-       return valid_pol;
+        return r_o.status;
 }
 
 /****************************************************************************
-do a SPOOL Close
+do a SPOOLSS Get Printer Driver Direcotry
 ****************************************************************************/
-BOOL spoolss_closeprinter(POLICY_HND *hnd)
+uint32 spoolss_getprinterdriverdir(fstring srv_name, fstring env_name, uint32 level,
+                             NEW_BUFFER *buffer, uint32 offered,
+                             uint32 *needed)
 {
-       prs_struct rbuf;
-       prs_struct buf; 
-       SPOOL_Q_CLOSEPRINTER q_c;
-       BOOL valid_close = False;
+        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);
 
-       if (hnd == NULL) return False;
+        struct cli_connection *con = NULL;
 
-       /* create and send a MSRPC command with api SPOOLSS_CLOSEPRINTER */
+        if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
+                return False;
 
-       prs_init(&buf , 1024, 4, SAFETY_MARGIN, False);
-       prs_init(&rbuf, 0   , 4, SAFETY_MARGIN, True );
+        prs_init(&buf , MAX_PDU_FRAG_LEN, 4, ctx, MARSHALL);
+        prs_init(&rbuf, 0, 4, ctx, UNMARSHALL);
 
-       DEBUG(4,("SPOOL Close Printer\n"));
+        /* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
 
-       /* store the parameters */
-       make_spoolss_q_closeprinter(&q_c, hnd);
+        DEBUG(5,("SPOOLSS GetPrinterDriverDir (Server: %s Env: %s level: %d)\n", 
+                 srv_name, env_name, level));
 
-       /* turn parameters into data stream */
-       spoolss_io_q_closeprinter("", &q_c, &buf, 0);
+        make_spoolss_q_getprinterdriverdir(&q_o, srv_name, env_name, level, 
+                                          buffer, offered);
 
-       /* send the data on \PIPE\ */
-       if (rpc_hnd_pipe_req(hnd, SPOOLSS_CLOSEPRINTER, &buf, &rbuf))
+        /* turn parameters into data stream */
+        if (spoolss_io_q_getprinterdriverdir("", &q_o, &buf, 0) &&
+             rpc_con_pipe_req(con, SPOOLSS_GETPRINTERDRIVERDIRECTORY, &buf, &rbuf)) 
        {
-               SPOOL_R_CLOSEPRINTER r_c;
-               BOOL p;
+               prs_mem_free(&buf );
+               ZERO_STRUCT(r_o);
 
-               spoolss_io_r_closeprinter("", &r_c, &rbuf, 0);
-               p = rbuf.offset != 0;
+               prs_switch_type(&buffer->prs, UNMARSHALL);
+               prs_set_offset(&buffer->prs, 0);
+               r_o.buffer=buffer;
 
-               if (p && r_c.status != 0)
+               if(spoolss_io_r_getprinterdriverdir("", &r_o, &rbuf, 0)) 
                {
-                       /* report error code */
-                       DEBUG(0,("SPOOL_CLOSEPRINTER: %s\n", get_nt_error_msg(r_c.status)));
-                       p = False;
+                       if (r_o.status != NT_STATUS_NO_PROBLEMO)
+                       {
+                               DEBUG(3,("SPOOLSS_GETPRINTERDRIVERDIRECTORY: %s\n", get_nt_error_msg(r_o.status)));
+                       }
+
+                       *needed=r_o.needed;
                }
+       }
 
-               if (p)
-               {
-                       /* check that the returned policy handle is all zeros */
-                       uint32 i;
-                       valid_close = True;
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
 
-                       for (i = 0; i < sizeof(r_c.handle.data); i++)
-                       {
-                               if (r_c.handle.data[i] != 0)
-                               {
-                                       valid_close = False;
-                                       break;
-                               }
-                       }       
-                       if (!valid_close)
+        cli_connection_unlink(con);
+
+        return r_o.status;
+}
+
+/******************************************************************************
+ AddPrinterDriver()
+ *****************************************************************************/
+uint32 spoolss_addprinterdriver(const char *srv_name, uint32 level, PRINTER_DRIVER_CTR *info)
+{
+        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;
+
+       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);
+       
+       /* make the ADDPRINTERDRIVER PDU */
+       make_spoolss_q_addprinterdriver(&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_NO_PROBLEMO)
                        {
-                               DEBUG(0,("SPOOL_CLOSEPRINTER: non-zero handle returned\n"));
+                               /* report error code */
+                               DEBUG(3,("SPOOLSS_ADDPRINTERDRIVER: %s\n", get_nt_error_msg(r_o.status)));
                        }
                }
-       }
+        }
 
-       prs_mem_free(&rbuf);
-       prs_mem_free(&buf );
 
-       close_policy_hnd(hnd);
+        prs_mem_free(&rbuf);
+        prs_mem_free(&buf );
+       free_spool_driver_info_3(q_o.info.info_3);
+
+       if (mem_ctx)
+               talloc_destroy(mem_ctx);
+               
+       return r_o.status;
 
-       return valid_close;
 }
 
+