Removed version number from file header.
[samba.git] / source / rpcclient / cmd_spoolss.c
index aeb4ce3e20ee86d95a64e147386ac58a3bdb97c9..45a553beb2d7fcc8555f26c87d33f2314722592d 100644 (file)
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.2
+   Unix SMB/CIFS implementation.
    RPC pipe client
 
    Copyright (C) Gerald Carter                     2001
 */
 
 #include "includes.h"
-
-extern int DEBUGLEVEL;
-
-extern pstring server;
-extern pstring global_myname;
-extern pstring username, password;
-extern pstring workgroup;
+#include "rpcclient.h"
 
 struct table_node {
        char    *long_archi;
@@ -64,7 +57,7 @@ BOOL get_short_archi(char *short_archi, char *long_archi)
 
         if (archi_table[i].long_archi==NULL) {
                 DEBUGADD(10,("Unknown architecture [%s] !\n", long_archi));
-                return FALSE;
+                return False;
         }
 
         StrnCpy (short_archi, archi_table[i].short_archi, strlen(archi_table[i].short_archi));
@@ -80,172 +73,112 @@ BOOL get_short_archi(char *short_archi, char *long_archi)
 /**********************************************************************
  * dummy function  -- placeholder
   */
-static uint32 cmd_spoolss_not_implemented (struct cli_state *cli, 
-                                          int argc, char **argv)
+static NTSTATUS cmd_spoolss_not_implemented(struct cli_state *cli, 
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc, char **argv)
 {
        printf ("(*) This command is not currently implemented.\n");
-       return NT_STATUS_NO_PROBLEMO;
-}
-
-/****************************************************************************
- display sec_ace structure
- ****************************************************************************/
-static void display_sec_ace(SEC_ACE *ace)
-{
-       fstring sid_str;
-
-       sid_to_string(sid_str, &ace->sid);
-       printf("\t\tSID: %s\n", sid_str);
-
-       printf("\t\ttype:[%d], flags:[0x%02x], mask:[0x%08x]\n", 
-              ace->type, ace->flags, ace->info.mask);
-}
-
-/****************************************************************************
- display sec_acl structure
- ****************************************************************************/
-static void display_sec_acl(SEC_ACL *acl)
-{
-       if (acl->size != 0 && acl->num_aces != 0) {
-               int i;
-
-               printf("\t\tRevision:[%d]\n", acl->revision);
-               for (i = 0; i < acl->num_aces; i++) {
-                       display_sec_ace(&acl->ace[i]);
-               }
-       }
-}
-
-/****************************************************************************
- display sec_desc structure
- ****************************************************************************/
-static void display_sec_desc(SEC_DESC *sec)
-{
-       fstring sid_str;
-
-       printf("\tRevision:[%d]\n", sec->revision);
-
-       if (sec->off_owner_sid) {
-               sid_to_string(sid_str, sec->owner_sid);
-               printf("\tOwner SID: %s\n", sid_str);
-       }
-
-       if (sec->off_grp_sid) {
-               sid_to_string(sid_str, sec->grp_sid);
-               printf("\tGroup SID: %s\n", sid_str);
-       }
-
-       if (sec->off_sacl) display_sec_acl(sec->sacl);
-       if (sec->off_dacl) display_sec_acl(sec->dacl);
+       return NT_STATUS_OK;
 }
 
 /***********************************************************************
  * Get printer information
  */
-static uint32 cmd_spoolss_open_printer_ex(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli, 
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc, char **argv)
 {
-       uint32          result = NT_STATUS_UNSUCCESSFUL; 
+       WERROR          werror;
        pstring         printername;
        fstring         servername, user;
        POLICY_HND      hnd;
-       TALLOC_CTX      *mem_ctx;
        
        if (argc != 2) {
                printf("Usage: %s <printername>\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
        }
        
        if (!cli)
                return NT_STATUS_UNSUCCESSFUL;
 
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_open_printer_ex: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-
        slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
        strupper (servername);
        fstrcpy  (user, cli->user_name);
        fstrcpy  (printername, argv[1]);
 
-               
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
        /* Open the printer handle */
-       result = cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "", 
-                               MAXIMUM_ALLOWED_ACCESS, servername, user, &hnd);
-
-       if (result == NT_STATUS_NOPROBLEMO) {
-               printf ("Printer %s opened successfully\n", printername);
-               result = cli_spoolss_close_printer (cli, mem_ctx, &hnd);
-               if (result != NT_STATUS_NOPROBLEMO) {
-                       printf ("Error closing printer handle! (%s)\n", get_nt_error_msg(result));
+
+       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &hnd);
+
+       if (W_ERROR_IS_OK(werror)) {
+               printf("Printer %s opened successfully\n", printername);
+               werror = cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+               if (!W_ERROR_IS_OK(werror)) {
+                       printf("Error closing printer handle! (%s)\n", 
+                               get_dos_error_msg(werror));
                }
        }
 
-       cli_nt_session_close(cli);
-       talloc_destroy(mem_ctx);
-
-       return result;
+       return werror_to_ntstatus(werror);
 }
 
 
 /****************************************************************************
 printer info level 0 display function
 ****************************************************************************/
-static void display_print_info_0(PRINTER_INFO_0 *i1)
+static void display_print_info_0(PRINTER_INFO_0 *i0)
 {
-       fstring         name;
-       fstring         servername;
+       fstring         name = "";
+       fstring         servername = "";
 
-       unistr_to_ascii(name, i1->printername.buffer, sizeof(name) - 1);
-       unistr_to_ascii(servername, i1->servername.buffer, sizeof(servername) - 1);
+       if (i0->printername.buffer)
+               rpcstr_pull(name, i0->printername.buffer, sizeof(name), 0, STR_TERMINATE);
 
+       if (i0->servername.buffer)
+               rpcstr_pull(servername, i0->servername.buffer, sizeof(servername), 0,STR_TERMINATE);
+  
        printf("\tprintername:[%s]\n", name);
        printf("\tservername:[%s]\n", servername);
-       printf("\tcjobs:[0x%x]\n", i1->cjobs);
-       printf("\ttotal_jobs:[0x%x]\n", i1->total_jobs);
+       printf("\tcjobs:[0x%x]\n", i0->cjobs);
+       printf("\ttotal_jobs:[0x%x]\n", i0->total_jobs);
        
-       printf("\t:date: [%d]-[%d]-[%d] (%d)\n", i1->year, i1->month, 
-              i1->day, i1->dayofweek);
-       printf("\t:time: [%d]-[%d]-[%d]-[%d]\n", i1->hour, i1->minute, 
-              i1->second, i1->milliseconds);
+       printf("\t:date: [%d]-[%d]-[%d] (%d)\n", i0->year, i0->month, 
+              i0->day, i0->dayofweek);
+       printf("\t:time: [%d]-[%d]-[%d]-[%d]\n", i0->hour, i0->minute, 
+              i0->second, i0->milliseconds);
        
-       printf("\tglobal_counter:[0x%x]\n", i1->global_counter);
-       printf("\ttotal_pages:[0x%x]\n", i1->total_pages);
+       printf("\tglobal_counter:[0x%x]\n", i0->global_counter);
+       printf("\ttotal_pages:[0x%x]\n", i0->total_pages);
        
-       printf("\tmajorversion:[0x%x]\n", i1->major_version);
-       printf("\tbuildversion:[0x%x]\n", i1->build_version);
+       printf("\tmajorversion:[0x%x]\n", i0->major_version);
+       printf("\tbuildversion:[0x%x]\n", i0->build_version);
        
-       printf("\tunknown7:[0x%x]\n", i1->unknown7);
-       printf("\tunknown8:[0x%x]\n", i1->unknown8);
-       printf("\tunknown9:[0x%x]\n", i1->unknown9);
-       printf("\tsession_counter:[0x%x]\n", i1->session_counter);
-       printf("\tunknown11:[0x%x]\n", i1->unknown11);
-       printf("\tprinter_errors:[0x%x]\n", i1->printer_errors);
-       printf("\tunknown13:[0x%x]\n", i1->unknown13);
-       printf("\tunknown14:[0x%x]\n", i1->unknown14);
-       printf("\tunknown15:[0x%x]\n", i1->unknown15);
-       printf("\tunknown16:[0x%x]\n", i1->unknown16);
-       printf("\tchange_id:[0x%x]\n", i1->change_id);
-       printf("\tunknown18:[0x%x]\n", i1->unknown18);
-       printf("\tstatus:[0x%x]\n", i1->status);
-       printf("\tunknown20:[0x%x]\n", i1->unknown20);
-       printf("\tc_setprinter:[0x%x]\n", i1->c_setprinter);
-       printf("\tunknown22:[0x%x]\n", i1->unknown22);
-       printf("\tunknown23:[0x%x]\n", i1->unknown23);
-       printf("\tunknown24:[0x%x]\n", i1->unknown24);
-       printf("\tunknown25:[0x%x]\n", i1->unknown25);
-       printf("\tunknown26:[0x%x]\n", i1->unknown26);
-       printf("\tunknown27:[0x%x]\n", i1->unknown27);
-       printf("\tunknown28:[0x%x]\n", i1->unknown28);
-       printf("\tunknown29:[0x%x]\n", i1->unknown29);
+       printf("\tunknown7:[0x%x]\n", i0->unknown7);
+       printf("\tunknown8:[0x%x]\n", i0->unknown8);
+       printf("\tunknown9:[0x%x]\n", i0->unknown9);
+       printf("\tsession_counter:[0x%x]\n", i0->session_counter);
+       printf("\tunknown11:[0x%x]\n", i0->unknown11);
+       printf("\tprinter_errors:[0x%x]\n", i0->printer_errors);
+       printf("\tunknown13:[0x%x]\n", i0->unknown13);
+       printf("\tunknown14:[0x%x]\n", i0->unknown14);
+       printf("\tunknown15:[0x%x]\n", i0->unknown15);
+       printf("\tunknown16:[0x%x]\n", i0->unknown16);
+       printf("\tchange_id:[0x%x]\n", i0->change_id);
+       printf("\tunknown18:[0x%x]\n", i0->unknown18);
+       printf("\tstatus:[0x%x]\n", i0->status);
+       printf("\tunknown20:[0x%x]\n", i0->unknown20);
+       printf("\tc_setprinter:[0x%x]\n", i0->c_setprinter);
+       printf("\tunknown22:[0x%x]\n", i0->unknown22);
+       printf("\tunknown23:[0x%x]\n", i0->unknown23);
+       printf("\tunknown24:[0x%x]\n", i0->unknown24);
+       printf("\tunknown25:[0x%x]\n", i0->unknown25);
+       printf("\tunknown26:[0x%x]\n", i0->unknown26);
+       printf("\tunknown27:[0x%x]\n", i0->unknown27);
+       printf("\tunknown28:[0x%x]\n", i0->unknown28);
+       printf("\tunknown29:[0x%x]\n", i0->unknown29);
 }
 
 /****************************************************************************
@@ -253,13 +186,21 @@ printer info level 1 display function
 ****************************************************************************/
 static void display_print_info_1(PRINTER_INFO_1 *i1)
 {
-       fstring desc;
-       fstring name;
-       fstring comm;
+       fstring desc = "";
+       fstring name = "";
+       fstring comm = "";
+
+       if (i1->description.buffer)
+               rpcstr_pull(desc, i1->description.buffer, sizeof(desc), 0, 
+                           STR_TERMINATE);
+
+       if (i1->name.buffer)
+               rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, 
+                           STR_TERMINATE);
 
-       unistr_to_ascii(desc, i1->description.buffer, sizeof(desc) - 1);
-       unistr_to_ascii(name, i1->name       .buffer, sizeof(name) - 1);
-       unistr_to_ascii(comm, i1->comment    .buffer, sizeof(comm) - 1);
+       if (i1->comment.buffer)
+               rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), 0, 
+                           STR_TERMINATE);
 
        printf("\tflags:[0x%x]\n", i1->flags);
        printf("\tname:[%s]\n", name);
@@ -272,35 +213,50 @@ printer info level 2 display function
 ****************************************************************************/
 static void display_print_info_2(PRINTER_INFO_2 *i2)
 {
-       fstring servername;
-       fstring printername;
-       fstring sharename;
-       fstring portname;
-       fstring drivername;
-       fstring comment;
-       fstring location;
-       fstring sepfile;
-       fstring printprocessor;
-       fstring datatype;
-       fstring parameters;
+       fstring servername = "";
+       fstring printername = "";
+       fstring sharename = "";
+       fstring portname = "";
+       fstring drivername = "";
+       fstring comment = "";
+       fstring location = "";
+       fstring sepfile = "";
+       fstring printprocessor = "";
+       fstring datatype = "";
+       fstring parameters = "";
        
-       unistr_to_ascii(servername, i2->servername.buffer, 
-                       sizeof(servername) - 1);
-       unistr_to_ascii(printername, i2->printername.buffer, 
-                       sizeof(printername) - 1);
-       unistr_to_ascii(sharename, i2->sharename.buffer,
-                       sizeof(sharename) - 1);
-       unistr_to_ascii(portname, i2->portname.buffer, sizeof(portname) - 1);
-       unistr_to_ascii(drivername, i2->drivername.buffer, 
-                       sizeof(drivername) - 1);
-       unistr_to_ascii(comment, i2->comment.buffer, sizeof(comment) - 1);
-       unistr_to_ascii(location, i2->location.buffer, sizeof(location) - 1);
-       unistr_to_ascii(sepfile, i2->sepfile.buffer, sizeof(sepfile) - 1);
-       unistr_to_ascii(printprocessor, i2->printprocessor.buffer, 
-                       sizeof(printprocessor) - 1);
-       unistr_to_ascii(datatype, i2->datatype.buffer, sizeof(datatype) - 1);
-       unistr_to_ascii(parameters, i2->parameters.buffer, 
-                       sizeof(parameters) - 1);
+       if (i2->servername.buffer)
+               rpcstr_pull(servername, i2->servername.buffer,sizeof(servername), 0, STR_TERMINATE);
+
+       if (i2->printername.buffer)
+               rpcstr_pull(printername, i2->printername.buffer,sizeof(printername), 0, STR_TERMINATE);
+
+       if (i2->sharename.buffer)
+               rpcstr_pull(sharename, i2->sharename.buffer,sizeof(sharename), 0, STR_TERMINATE);
+
+       if (i2->portname.buffer)
+               rpcstr_pull(portname, i2->portname.buffer,sizeof(portname), 0, STR_TERMINATE);
+
+       if (i2->drivername.buffer)
+               rpcstr_pull(drivername, i2->drivername.buffer,sizeof(drivername), 0, STR_TERMINATE);
+
+       if (i2->comment.buffer)
+               rpcstr_pull(comment, i2->comment.buffer,sizeof(comment), 0, STR_TERMINATE);
+
+       if (i2->location.buffer)
+               rpcstr_pull(location, i2->location.buffer,sizeof(location), 0, STR_TERMINATE);
+
+       if (i2->sepfile.buffer)
+               rpcstr_pull(sepfile, i2->sepfile.buffer,sizeof(sepfile), 0, STR_TERMINATE);
+
+       if (i2->printprocessor.buffer) 
+               rpcstr_pull(printprocessor, i2->printprocessor.buffer,sizeof(printprocessor), 0, STR_TERMINATE);
+
+       if (i2->datatype.buffer)
+               rpcstr_pull(datatype, i2->datatype.buffer,sizeof(datatype), 0, STR_TERMINATE);
+
+       if (i2->parameters.buffer)
+               rpcstr_pull(parameters, i2->parameters.buffer,sizeof(parameters), 0, STR_TERMINATE);
 
        printf("\tservername:[%s]\n", servername);
        printf("\tprintername:[%s]\n", printername);
@@ -337,69 +293,59 @@ static void display_print_info_3(PRINTER_INFO_3 *i3)
 
 /* Enumerate printers */
 
-static uint32 cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli, 
+                                          TALLOC_CTX *mem_ctx,
+                                          int argc, char **argv)
 {
-       uint32                  result = NT_STATUS_UNSUCCESSFUL, 
-                               info_level = 1;
+       WERROR                  result;
+       uint32                  info_level = 1;
        PRINTER_INFO_CTR        ctr;
-       int                     returned;
-       uint32                  i = 0;
-       TALLOC_CTX              *mem_ctx;
+       uint32                  i = 0, num_printers, needed;
 
        if (argc > 2) 
        {
                printf("Usage: %s [level]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
        }
 
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_enum_printers: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-
        if (argc == 2) {
                info_level = atoi(argv[1]);
        }
 
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
        /* Enumerate printers  -- Should we enumerate types other 
           than PRINTER_ENUM_LOCAL?  Maybe accept as a parameter?  --jerry */
+
        ZERO_STRUCT(ctr);
-       result = cli_spoolss_enum_printers(cli, mem_ctx, PRINTER_ENUM_LOCAL, 
-                                          info_level, &returned, &ctr);
 
-       if (result == NT_STATUS_NOPROBLEMO) 
-       {
-               if (!returned)
+       result = cli_spoolss_enum_printers(
+               cli, mem_ctx, 0, &needed, PRINTER_ENUM_LOCAL, 
+               info_level, &num_printers, &ctr);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_enum_printers(
+                       cli, mem_ctx, needed, NULL, PRINTER_ENUM_LOCAL, 
+                       info_level, &num_printers, &ctr);
+
+       if (W_ERROR_IS_OK(result)) {
+               if (!num_printers)
                        printf ("No Printers printers returned.\n");
        
                switch(info_level) {
                case 0:
-                       for (i=0; i<returned; i++) {
-                               display_print_info_0(&(ctr.printers_0[i]));
-                       }
+                       for (i=0; i < num_printers; i++)
+                               display_print_info_0(&ctr.printers_0[i]);
                        break;
                case 1:
-                       for (i=0; i<returned; i++) {
-                               display_print_info_1(&(ctr.printers_1[i]));
-                       }
+                       for (i=0; i < num_printers; i++)
+                               display_print_info_1(&ctr.printers_1[i]);
                        break;
                case 2:
-                       for (i=0; i<returned; i++) {
-                               display_print_info_2(&(ctr.printers_2[i]));
-                       }
+                       for (i=0; i < num_printers; i++)
+                               display_print_info_2(&ctr.printers_2[i]);
                        break;
                case 3:
-                       for (i=0; i<returned; i++) {
-                               display_print_info_3(&(ctr.printers_3[i]));
-                       }
+                       for (i=0; i < num_printers; i++)
+                               display_print_info_3(&ctr.printers_3[i]);
                        break;
                default:
                        printf("unknown info level %d\n", info_level);
@@ -407,10 +353,7 @@ static uint32 cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char **
                }
        }
 
-       cli_nt_session_close(cli);
-       talloc_destroy(mem_ctx);
-
-       return result;
+       return werror_to_ntstatus(result);
 }
 
 /****************************************************************************
@@ -420,7 +363,7 @@ static void display_port_info_1(PORT_INFO_1 *i1)
 {
        fstring buffer;
        
-       unistr_to_ascii(buffer, i1->port_name.buffer, sizeof(buffer)-1);
+       rpcstr_pull(buffer, i1->port_name.buffer, sizeof(buffer), 0, STR_TERMINATE);
        printf("\tPort Name:\t[%s]\n", buffer);
 }
 
@@ -431,11 +374,13 @@ static void display_port_info_2(PORT_INFO_2 *i2)
 {
        fstring buffer;
        
-       unistr_to_ascii(buffer, i2->port_name.buffer, sizeof(buffer) - 1);
+       rpcstr_pull(buffer, i2->port_name.buffer, sizeof(buffer), 0, STR_TERMINATE);
        printf("\tPort Name:\t[%s]\n", buffer);
-       unistr_to_ascii(buffer, i2->monitor_name.buffer, sizeof(buffer) - 1);
+       rpcstr_pull(buffer, i2->monitor_name.buffer, sizeof(buffer), 0, STR_TERMINATE);
+
        printf("\tMonitor Name:\t[%s]\n", buffer);
-       unistr_to_ascii(buffer, i2->description.buffer, sizeof(buffer) - 1);
+       rpcstr_pull(buffer, i2->description.buffer, sizeof(buffer), 0, STR_TERMINATE);
+
        printf("\tDescription:\t[%s]\n", buffer);
        printf("\tPort Type:\t[%d]\n", i2->port_type);
        printf("\tReserved:\t[%d]\n", i2->reserved);
@@ -444,49 +389,42 @@ static void display_port_info_2(PORT_INFO_2 *i2)
 
 /* Enumerate ports */
 
-static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx, int argc, 
+                                      char **argv)
 {
-       uint32                  result = NT_STATUS_UNSUCCESSFUL, 
-                               info_level = 1;
+       WERROR                  result;
+       uint32                  needed, info_level = 1;
        PORT_INFO_CTR           ctr;
        int                     returned;
-       TALLOC_CTX              *mem_ctx;
        
        if (argc > 2) {
                printf("Usage: %s [level]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
-       }
-       
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_enum_ports: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+               return NT_STATUS_OK;
        }
        
-
-       if (argc == 2) {
+       if (argc == 2)
                info_level = atoi(argv[1]);
-       }
-
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
 
        /* Enumerate ports */
+
        ZERO_STRUCT(ctr);
 
-       result = cli_spoolss_enum_ports(cli, mem_ctx, info_level, &returned, &ctr);
+       result = cli_spoolss_enum_ports(cli, mem_ctx, 0, &needed, info_level, 
+                                       &returned, &ctr);
 
-       if (result == NT_STATUS_NOPROBLEMO) {
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_enum_ports(cli, mem_ctx, needed, NULL,
+                                               info_level, &returned, &ctr);
+
+       if (W_ERROR_IS_OK(result)) {
                int i;
 
                for (i = 0; i < returned; i++) {
                        switch (info_level) {
                        case 1:
                                display_port_info_1(&ctr.port.info_1[i]);
-                       break;
+                               break;
                        case 2:
                                display_port_info_2(&ctr.port.info_2[i]);
                                break;
@@ -496,44 +434,30 @@ static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **arg
                        }
                }
        }
-
-       cli_nt_session_close(cli);
-       talloc_destroy(mem_ctx);
-
-       return result;
+       
+       return werror_to_ntstatus(result);
 }
 
 /***********************************************************************
  * Get printer information
  */
-static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli, 
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc, char **argv)
 {
        POLICY_HND      pol;
-       uint32          result, 
-                       info_level = 1;
+       WERROR          werror;
+       NTSTATUS        result;
+       uint32          info_level = 1;
        BOOL            opened_hnd = False;
        PRINTER_INFO_CTR ctr;
        fstring         printername, 
                        servername,
                        user;
-       TALLOC_CTX      *mem_ctx;
 
        if (argc == 1 || argc > 3) {
                printf("Usage: %s <printername> [level]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
-       }
-
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_getprinter: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
+               return NT_STATUS_OK;
        }
 
        /* Open a printer handle */
@@ -547,19 +471,24 @@ static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **arg
        fstrcpy  (user, cli->user_name);
        
        /* get a printer handle */
-       if ((result = cli_spoolss_open_printer_ex(
-               cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, servername,
-               user, &pol)) != NT_STATUS_NOPROBLEMO) {
+
+       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &pol);
+
+       result = werror_to_ntstatus(werror);
+
+       if (!NT_STATUS_IS_OK(result))
                goto done;
-       }
  
        opened_hnd = True;
 
        /* Get printer info */
-       if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr))
-           != NT_STATUS_NOPROBLEMO) {
+
+       result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr);
+
+       if (!NT_STATUS_IS_OK(result))
                goto done;
-       }
 
        /* Display printer info */
 
@@ -585,9 +514,6 @@ static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **arg
        if (opened_hnd) 
                cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-       cli_nt_session_close(cli);
-       talloc_destroy(mem_ctx);
-
        return result;
 }
 
@@ -600,7 +526,7 @@ static void display_print_driver_1(DRIVER_INFO_1 *i1)
        if (i1 == NULL)
                return;
 
-       unistr_to_ascii(name, i1->name.buffer, sizeof(name)-1);
+       rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
 
        printf ("Printer Driver Info 1:\n");
        printf ("\tDriver Name: [%s]\n\n", name);
@@ -621,11 +547,11 @@ static void display_print_driver_2(DRIVER_INFO_2 *i1)
        if (i1 == NULL)
                return;
 
-       unistr_to_ascii(name, i1->name.buffer, sizeof(name)-1);
-       unistr_to_ascii(architecture, i1->architecture.buffer, sizeof(architecture)-1);
-       unistr_to_ascii(driverpath, i1->driverpath.buffer, sizeof(driverpath)-1);
-       unistr_to_ascii(datafile, i1->datafile.buffer, sizeof(datafile)-1);
-       unistr_to_ascii(configfile, i1->configfile.buffer, sizeof(configfile)-1);
+       rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
+       rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), 0, STR_TERMINATE);
+       rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), 0, STR_TERMINATE);
+       rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), 0, STR_TERMINATE);
+       rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), 0, STR_TERMINATE);
 
        printf ("Printer Driver Info 2:\n");
        printf ("\tVersion: [%x]\n", i1->version);
@@ -659,19 +585,18 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1)
        if (i1 == NULL)
                return;
 
-       unistr_to_ascii(name, i1->name.buffer, sizeof(name)-1);
-       unistr_to_ascii(architecture, i1->architecture.buffer, sizeof(architecture)-1);
-       unistr_to_ascii(driverpath, i1->driverpath.buffer, sizeof(driverpath)-1);
-       unistr_to_ascii(datafile, i1->datafile.buffer, sizeof(datafile)-1);
-       unistr_to_ascii(configfile, i1->configfile.buffer, sizeof(configfile)-1);
-       unistr_to_ascii(helpfile, i1->helpfile.buffer, sizeof(helpfile)-1);
-       
-       unistr_to_ascii(monitorname, i1->monitorname.buffer, sizeof(monitorname)-1);
-       unistr_to_ascii(defaultdatatype, i1->defaultdatatype.buffer, sizeof(defaultdatatype)-1);
+       rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
+       rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), 0, STR_TERMINATE);
+       rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), 0, STR_TERMINATE);
+       rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), 0, STR_TERMINATE);
+       rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), 0, STR_TERMINATE);
+       rpcstr_pull(helpfile, i1->helpfile.buffer, sizeof(helpfile), 0, STR_TERMINATE);
+       rpcstr_pull(monitorname, i1->monitorname.buffer, sizeof(monitorname), 0, STR_TERMINATE);
+       rpcstr_pull(defaultdatatype, i1->defaultdatatype.buffer, sizeof(defaultdatatype), 0, STR_TERMINATE);
 
        printf ("Printer Driver Info 3:\n");
        printf ("\tVersion: [%x]\n", i1->version);
-       printf ("\tDriver Name: [%s]\n",name );
+       printf ("\tDriver Name: [%s]\n",name);
        printf ("\tArchitecture: [%s]\n", architecture);
        printf ("\tDriver Path: [%s]\n", driverpath);
        printf ("\tDatafile: [%s]\n", datafile);
@@ -680,7 +605,8 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1)
 
        while (valid)
        {
-               unistr_to_ascii(dependentfiles, i1->dependentfiles+length, sizeof(dependentfiles)-1);
+               rpcstr_pull(dependentfiles, i1->dependentfiles+length, sizeof(dependentfiles), 0, STR_TERMINATE);
+               
                length+=strlen(dependentfiles)+1;
                
                if (strlen(dependentfiles) > 0)
@@ -704,36 +630,25 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1)
 /***********************************************************************
  * Get printer information
  */
-static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx,
+                                      int argc, char **argv)
 {
        POLICY_HND      pol;
-       uint32          result, 
-                       info_level = 3;
+       WERROR          werror;
+       NTSTATUS        result;
+       uint32          info_level = 3;
        BOOL            opened_hnd = False;
        PRINTER_DRIVER_CTR      ctr;
        fstring         printername, 
                        servername, 
                        user;
        uint32          i;
-       TALLOC_CTX      *mem_ctx;
 
        if ((argc == 1) || (argc > 3)) 
        {
                printf("Usage: %s <printername> [level]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
-       }
-
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_getdriver: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
+               return NT_STATUS_OK;
        }
 
        /* get the arguments need to open the printer handle */
@@ -745,40 +660,40 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv
                info_level = atoi(argv[2]);
 
        /* Open a printer handle */
-       if ((result=cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "", 
-                   MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) != NT_STATUS_NO_PROBLEMO) 
-       {
-               printf ("Error opening printer handle for %s!\n", printername);
+
+       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                                            PRINTER_ACCESS_USE,
+                                            servername, user, &pol);
+
+       result = werror_to_ntstatus(werror);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               printf("Error opening printer handle for %s!\n", printername);
                return result;
        }
 
        opened_hnd = True;
 
        /* loop through and print driver info level for each architecture */
-       for (i=0; archi_table[i].long_archi!=NULL; i++) 
-       {
-               result = cli_spoolss_getprinterdriver (cli, mem_ctx, &pol, info_level, 
+
+       for (i=0; archi_table[i].long_archi!=NULL; i++) {
+               uint32 needed;
+
+               werror = cli_spoolss_getprinterdriver(
+                       cli, mem_ctx, 0, &needed, &pol, info_level, 
+                       archi_table[i].long_archi, &ctr);
+
+               if (W_ERROR_V(werror) == ERRinsufficientbuffer)
+                       werror = cli_spoolss_getprinterdriver(
+                               cli, mem_ctx, needed, NULL, &pol, info_level, 
                                archi_table[i].long_archi, &ctr);
-                               
-               switch (result)
-               {
-               case NT_STATUS_NO_PROBLEMO:
-                       break;
-                       
-               case ERROR_UNKNOWN_PRINTER_DRIVER:
-                       continue;
 
-               default:
-                       printf ("Error getting driver for %s [%s] - %s\n", printername,
-                               archi_table[i].long_archi, get_nt_error_msg(result));
+               if (!W_ERROR_IS_OK(werror))
                        continue;
-               }
-
                        
                printf ("\n[%s]\n", archi_table[i].long_archi);
-               switch (info_level) 
-               {
-                       
+
+               switch (info_level) {
                case 1:
                        display_print_driver_1 (ctr.info1);
                        break;
@@ -792,54 +707,34 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv
                        printf("unknown info level %d\n", info_level);
                        break;
                }
-               
-       
        }
        
+       /* Cleanup */
 
-       /* cleanup */
        if (opened_hnd)
                cli_spoolss_close_printer (cli, mem_ctx, &pol);
-       cli_nt_session_close (cli);
-       talloc_destroy(mem_ctx);
        
-       if (result==ERROR_UNKNOWN_PRINTER_DRIVER)
-               return NT_STATUS_NO_PROBLEMO;
-       else 
-               return result;
-               
+       return result;
 }
 
 /***********************************************************************
  * Get printer information
  */
-static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, char **argv)
 {
-       uint32          result=0, 
-                       info_level = 1;
+       NTSTATUS        result = NT_STATUS_OK;
+       uint32          info_level = 1;
        PRINTER_DRIVER_CTR      ctr;
        fstring         servername;
        uint32          i, j,
                        returned;
-       TALLOC_CTX      *mem_ctx;
 
        if (argc > 2) 
        {
                printf("Usage: enumdrivers [level]\n");
-               return NT_STATUS_NOPROBLEMO;
-       }
-
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_enum_drivers: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
+               return NT_STATUS_OK;
        }
 
        /* get the arguments need to open the printer handle */
@@ -860,7 +755,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a
                        continue;
                        
 
-               if (result != NT_STATUS_NO_PROBLEMO)
+               if (!NT_STATUS_IS_OK(result))
                {
                        printf ("Error getting driver for environment [%s] - %s\n",
                                archi_table[i].long_archi, get_nt_error_msg(result));
@@ -892,16 +787,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a
                }
        }
        
-
-       /* cleanup */
-       cli_nt_session_close (cli);
-       talloc_destroy(mem_ctx);
-       
-       if (result==ERROR_UNKNOWN_PRINTER_DRIVER)
-               return NT_STATUS_NO_PROBLEMO;
-       else 
-               return result;
-               
+       return result;
 }
 
 /****************************************************************************
@@ -913,7 +799,7 @@ static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1)
         if (i1 == NULL)
                 return;
  
-        unistr_to_ascii(name, i1->name.buffer, sizeof(name)-1);
+       rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
  
        printf ("\tDirectory Name:[%s]\n", name);
 }
@@ -921,33 +807,20 @@ static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1)
 /***********************************************************************
  * Get printer driver directory information
  */
-static uint32 cmd_spoolss_getdriverdir(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, char **argv)
 {
-       uint32                  result;
+       NTSTATUS                result;
        fstring                 env;
        DRIVER_DIRECTORY_CTR    ctr;
-       TALLOC_CTX              *mem_ctx;
 
        if (argc > 2) 
        {
                printf("Usage: %s [environment]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
-       }
-
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-       
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_getdriverdir: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+               return NT_STATUS_OK;
        }
 
-
        /* get the arguments need to open the printer handle */
        if (argc == 2)
                fstrcpy (env, argv[1]);
@@ -955,21 +828,15 @@ static uint32 cmd_spoolss_getdriverdir(struct cli_state *cli, int argc, char **a
                fstrcpy (env, "Windows NT x86");
 
        /* Get the directory.  Only use Info level 1 */
-       if ((result = cli_spoolss_getprinterdriverdir (cli, mem_ctx, 1, env, &ctr)) 
-            != NT_STATUS_NO_PROBLEMO)
-       {
+       result = cli_spoolss_getprinterdriverdir (cli, mem_ctx, 1, env, &ctr);
+       if (!NT_STATUS_IS_OK(result)) {
                return result;
        }
 
        
        display_printdriverdir_1 (ctr.info1);
 
-       /* cleanup */
-       cli_nt_session_close (cli);
-       talloc_destroy(mem_ctx);
-       
        return result;
-               
 }
 
 /*******************************************************************************
@@ -1072,7 +939,7 @@ static BOOL init_drv_info_3_members (
        }
        for (i=0; i<len; i++)
        {
-               info->dependentfiles[i] = (uint16)str2[i];
+               info->dependentfiles[i] = SSVAL(&info->dependentfiles[i], 0, str2[i]);
        }
        info->dependentfiles[len] = '\0';
 
@@ -1080,15 +947,16 @@ static BOOL init_drv_info_3_members (
 }
 
 
-static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli, 
+                                             TALLOC_CTX *mem_ctx,
+                                             int argc, char **argv)
 {
-       uint32                  result,
-                               level = 3;
+       NTSTATUS                result;
+       uint32                  level = 3;
        PRINTER_DRIVER_CTR      ctr;
        DRIVER_INFO_3           info3;
        fstring                 arch;
        fstring                 driver_name;
-       TALLOC_CTX              *mem_ctx = NULL;
 
        /* parse the command arguements */
        if (argc != 3)
@@ -1098,22 +966,8 @@ static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, cha
                printf ("\t<Config File Name>:<Help File Name>:<Language Monitor Name>:\\\n");
                printf ("\t<Default Data Type>:<Comma Separated list of Files>\n");
 
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
         }
-       
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_addprinterdriver: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
                
        /* Fill in the DRIVER_INFO_3 struct */
        ZERO_STRUCT(info3);
@@ -1133,58 +987,38 @@ static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, cha
 
 
        ctr.info3 = &info3;
-       if ((result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr)) 
-            != NT_STATUS_NO_PROBLEMO)
-       {
+       result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr);
+       if (!NT_STATUS_IS_OK(result)) {
                return result;
        }
 
-       unistr_to_ascii (driver_name, info3.name.buffer, sizeof(driver_name)-1);
+       rpcstr_pull(driver_name, info3.name.buffer, sizeof(driver_name), 0, STR_TERMINATE);
        printf ("Printer Driver %s successfully installed.\n", driver_name);
 
-       /* cleanup */
-       cli_nt_session_close (cli);
-       talloc_destroy(mem_ctx);
-       
        return result;
-               
 }
 
 
-static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx, 
+                                         int argc, char **argv)
 {
-       uint32                  result,
-                               level = 2;
+       NTSTATUS                result;
+       uint32                  level = 2;
        PRINTER_INFO_CTR        ctr;
        PRINTER_INFO_2          info2;
        fstring                 servername;
-       TALLOC_CTX              *mem_ctx = NULL;
        
        /* parse the command arguements */
        if (argc != 5)
        {
                printf ("Usage: %s <name> <shared name> <driver> <port>\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
         }
        
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_addprinterex: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-
         slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
         strupper (servername);
 
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-               
        /* Fill in the DRIVER_INFO_3 struct */
        ZERO_STRUCT(info2);
 #if 0  /* JERRY */
@@ -1214,118 +1048,182 @@ static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char **
        */
 
        ctr.printers_2 = &info2;
-       if ((result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr)) 
-            != NT_STATUS_NO_PROBLEMO)
-       {
-               cli_nt_session_close (cli);
+       result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr);
+       if (!NT_STATUS_IS_OK(result)) {
                return result;
        }
 
        printf ("Printer %s successfully installed.\n", argv[1]);
 
-       /* cleanup */
-       cli_nt_session_close (cli);
-       talloc_destroy(mem_ctx);
-       
        return result;
-               
 }
 
-static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx,
+                                      int argc, char **argv)
 {
        POLICY_HND              pol;
-       uint32                  result,
-                               level = 2;
+       WERROR                  result;
+       NTSTATUS                nt_status;
+       uint32                  level = 2;
        BOOL                    opened_hnd = False;
        PRINTER_INFO_CTR        ctr;
        PRINTER_INFO_2          info2;
        fstring                 servername,
                                printername,
                                user;
-       TALLOC_CTX              *mem_ctx = NULL;
        
        /* parse the command arguements */
        if (argc != 3)
        {
                printf ("Usage: %s <printer> <driver>\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
         }
 
-       if (!(mem_ctx=talloc_init()))
-       {
-               DEBUG(0,("cmd_spoolss_setdriver: talloc_init returned NULL!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
        slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
        strupper (servername);
        slprintf (printername, sizeof(fstring)-1, "%s\\%s", servername, argv[1]);
        fstrcpy  (user, cli->user_name);
 
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-       
-               
-       /* get a printer handle */
-       if ((result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
-               MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) 
-               != NT_STATUS_NOPROBLEMO) 
-       {
+       /* Get a printer handle */
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                                            MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &pol);
+
+       nt_status = werror_to_ntstatus(result);
+
+       if (!NT_STATUS_IS_OK(nt_status))
                goto done;
-       }
  
        opened_hnd = True;
 
        /* Get printer info */
+
        ZERO_STRUCT (info2);
        ctr.printers_2 = &info2;
-       if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr)) != NT_STATUS_NOPROBLEMO) 
-       {
-               printf ("Unable to retreive printer information!\n");
+
+       nt_status = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr);
+
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               printf ("Unable to retrieve printer information!\n");
                goto done;
        }
 
-       /* set the printer driver */
+       /* Set the printer driver */
+
        init_unistr(&ctr.printers_2->drivername, argv[2]);
-       if ((result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0)) != NT_STATUS_NO_PROBLEMO)
-       {
-               printf ("SetPrinter call failed!\n");
+
+       nt_status = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0);
+
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               printf("SetPrinter call failed!\n");
                goto done;;
        }
-       printf ("Succesfully set %s to driver %s.\n", argv[1], argv[2]);
 
+       printf("Succesfully set %s to driver %s.\n", argv[1], argv[2]);
 
 done:
-       /* cleanup */
+       /* Cleanup */
+
        if (opened_hnd)
                cli_spoolss_close_printer(cli, mem_ctx, &pol);
-       cli_nt_session_close (cli);
-       talloc_destroy(mem_ctx);
        
-       return result;          
+       return nt_status;               
 }
 
 
+static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, char **argv)
+{
+       NTSTATUS                result = NT_STATUS_UNSUCCESSFUL;
+       fstring                 servername;
+       int                     i;
+       
+       /* parse the command arguements */
+       if (argc != 2)
+       {
+               printf ("Usage: %s <driver>\n", argv[0]);
+               return NT_STATUS_OK;
+        }
+
+       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+       strupper (servername);
+
+       /* delete the driver for all architectures */
+       for (i=0; archi_table[i].long_archi; i++)
+       {
+               /* make the call to remove the driver */
+               result = cli_spoolss_deleteprinterdriver(cli, mem_ctx, 
+                                                        archi_table[i].long_archi, argv[1]);
+               if (!NT_STATUS_IS_OK(result)) {
+                       printf ("Failed to remove driver %s for arch [%s] - error %s!\n", 
+                               argv[1], archi_table[i].long_archi, get_nt_error_msg(result));
+               }
+               else
+                       printf ("Driver %s removed for arch [%s].\n", argv[1], archi_table[i].long_archi);
+       }
+               
+       return NT_STATUS_OK;            
+}
+
+static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli, 
+                                           TALLOC_CTX *mem_ctx,
+                                           int argc, char **argv)
+{
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       char *servername = NULL, *environment = NULL;
+       fstring procdir;
+       
+       /* parse the command arguements */
+       if (argc < 2 || argc > 3) {
+               printf ("Usage: %s <server> [environment]\n", argv[0]);
+               return NT_STATUS_OK;
+        }
+
+       if (asprintf(&servername, "\\\\%s", cli->desthost) < 0)
+               return NT_STATUS_NO_MEMORY;
+       strupper(servername);
+
+       if (asprintf(&environment, "%s", (argc == 3) ? argv[2] : 
+                                       PRINTER_DRIVER_ARCHITECTURE) < 0) {
+               SAFE_FREE(servername);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       result = cli_spoolss_getprintprocessordirectory(
+               cli, mem_ctx, servername, environment, procdir);
+
+       if (NT_STATUS_IS_OK(result))
+               printf("%s", procdir);
+
+       SAFE_FREE(servername);
+       SAFE_FREE(environment);
+
+       return result;
+}
+
 /* List of commands exported by this module */
 struct cmd_set spoolss_commands[] = {
 
-       { "SPOOLSS",            NULL,                           "" },
-       { "adddriver",          cmd_spoolss_addprinterdriver,   "Add a print driver" },
-       { "addprinter",         cmd_spoolss_addprinterex,       "Add a printer" },
-       { "enumdata",           cmd_spoolss_not_implemented,    "Enumerate printer data (*)" },
-       { "enumjobs",           cmd_spoolss_not_implemented,    "Enumerate print jobs (*)" },
-       { "enumports",          cmd_spoolss_enum_ports,         "Enumerate printer ports" },
-       { "enumdrivers",        cmd_spoolss_enum_drivers,       "Enumerate installed printer drivers" },
-       { "enumprinters",       cmd_spoolss_enum_printers,      "Enumerate printers" },
-       { "getdata",            cmd_spoolss_not_implemented,    "Get print driver data (*)" },
-       { "getdriver",          cmd_spoolss_getdriver,          "Get print driver information" },
-       { "getdriverdir",       cmd_spoolss_getdriverdir,       "Get print driver upload directory" },
-       { "getprinter",         cmd_spoolss_getprinter,         "Get printer info" },
-       { "openprinter",        cmd_spoolss_open_printer_ex,    "Open printer handle" },
-       { "setdriver",          cmd_spoolss_setdriver,          "Set printer driver" },
-       { NULL, NULL, NULL }
+       { "SPOOLSS"  },
+
+       { "adddriver",          cmd_spoolss_addprinterdriver,   PIPE_SPOOLSS, "Add a print driver",                  "" },
+       { "addprinter",         cmd_spoolss_addprinterex,       PIPE_SPOOLSS, "Add a printer",                       "" },
+       { "deldriver",          cmd_spoolss_deletedriver,       PIPE_SPOOLSS, "Delete a printer driver",             "" },
+       { "enumdata",           cmd_spoolss_not_implemented,    PIPE_SPOOLSS, "Enumerate printer data (*)",          "" },
+       { "enumjobs",           cmd_spoolss_not_implemented,    PIPE_SPOOLSS, "Enumerate print jobs (*)",            "" },
+       { "enumports",          cmd_spoolss_enum_ports,         PIPE_SPOOLSS, "Enumerate printer ports",             "" },
+       { "enumdrivers",        cmd_spoolss_enum_drivers,       PIPE_SPOOLSS, "Enumerate installed printer drivers", "" },
+       { "enumprinters",       cmd_spoolss_enum_printers,      PIPE_SPOOLSS, "Enumerate printers",                  "" },
+       { "getdata",            cmd_spoolss_not_implemented,    PIPE_SPOOLSS, "Get print driver data (*)",           "" },
+       { "getdriver",          cmd_spoolss_getdriver,          PIPE_SPOOLSS, "Get print driver information",        "" },
+       { "getdriverdir",       cmd_spoolss_getdriverdir,       PIPE_SPOOLSS, "Get print driver upload directory",   "" },
+       { "getprinter",         cmd_spoolss_getprinter,         PIPE_SPOOLSS, "Get printer info",                    "" },
+       { "openprinter",        cmd_spoolss_open_printer_ex,    PIPE_SPOOLSS, "Open printer handle",                 "" },
+       { "setdriver",          cmd_spoolss_setdriver,          PIPE_SPOOLSS, "Set printer driver",                  "" },
+       { "getprintprocdir",    cmd_spoolss_getprintprocdir, PIPE_SPOOLSS, "Get print processor directory",          "" },
+
+       { NULL }
 };