This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...
[ira/wip.git] / source3 / rpcclient / cmd_spoolss.c
index 0b45767afe173842ce1cb3d7426b416f4baa39a4..e4ff06a35ec51b24345d6d8be75016958a89afff 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;
-       char    *short_archi;
+       const char      *long_archi;
+       const char      *short_archi;
        int     version;
 };
  
-struct table_node archi_table[]= {
+static const struct table_node archi_table[]= {
 
        {"Windows 4.0",          "WIN40",       0 },
        {"Windows NT x86",       "W32X86",      2 },
@@ -48,11 +41,20 @@ struct table_node archi_table[]= {
        {NULL,                   "",            -1 }
 };
 
+/**
+ * @file
+ *
+ * rpcclient module for SPOOLSS rpc pipe.
+ *
+ * This generally just parses and checks command lines, and then calls
+ * a cli_spoolss function.
+ **/
+
 /****************************************************************************
 function to do the mapping between the long architecture name and
 the short one.
 ****************************************************************************/
-BOOL get_short_archi(char *short_archi, char *long_archi)
+static const char *cmd_spoolss_get_short_archi(const char *long_archi)
 {
         int i=-1;
 
@@ -64,180 +66,133 @@ 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 NULL;
         }
 
-        StrnCpy (short_archi, archi_table[i].short_archi, strlen(archi_table[i].short_archi));
+       /* this might be client code - but shouldn't this be an fstrcpy etc? */
+
 
         DEBUGADD(108,("index: [%d]\n", i));
-        DEBUGADD(108,("long architecture: [%s]\n", long_archi));
-        DEBUGADD(108,("short architecture: [%s]\n", short_archi));
+        DEBUGADD(108,("long architecture: [%s]\n", archi_table[i].long_archi));
+        DEBUGADD(108,("short architecture: [%s]\n", archi_table[i].short_archi));
 
-        return True;
+       return archi_table[i].short_archi;
 }
 
-
+#if 0
 /**********************************************************************
  * dummy function  -- placeholder
   */
-static uint32 cmd_spoolss_not_implemented (struct cli_state *cli, 
-                                          int argc, char **argv)
+static WERROR cmd_spoolss_not_implemented(struct cli_state *cli, 
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc, const 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 WERR_OK;
 }
+#endif
 
 /***********************************************************************
  * Get printer information
  */
-static uint32 cmd_spoolss_open_printer_ex(struct cli_state *cli, int argc, char **argv)
+static WERROR cmd_spoolss_open_printer_ex(struct cli_state *cli, 
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc, const char **argv)
 {
-       uint32          result = NT_STATUS_UNSUCCESSFUL; 
-       pstring         printername;
-       fstring         server, user;
+       WERROR          werror;
+       fstring         printername;
+       fstring         servername, user;
        POLICY_HND      hnd;
        
        if (argc != 2) {
-               printf("Usage: openprinter <printername>\n");
-               return NT_STATUS_NOPROBLEMO;
+               printf("Usage: %s <printername>\n", argv[0]);
+               return WERR_OK;
        }
        
        if (!cli)
-               return NT_STATUS_UNSUCCESSFUL;
-               
+            return WERR_GENERAL_FAILURE;
 
-       slprintf (server, sizeof(fstring), "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf (servername, sizeof(servername)-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, printername, "", 
-                               MAXIMUM_ALLOWED_ACCESS, server, user, &hnd);
-
-       if (result == NT_STATUS_NOPROBLEMO) {
-               printf ("Printer %s opened successfully\n", printername);
-               result = cli_spoolss_close_printer (cli, &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, 
+                                            "", PRINTER_ALL_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);
-
-       return result;
+       return 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         the_server;
+       fstring name = "";
+       fstring servername = "";
 
-       unistr_to_ascii(name, i1->printername.buffer, sizeof(name) - 1);
-       unistr_to_ascii(the_server, i1->servername.buffer, sizeof(the_server) - 1);
+       if (!i0)
+               return;
+
+       rpcstr_pull(name, i0->printername.buffer, sizeof(name), -1, STR_TERMINATE);
 
+       rpcstr_pull(servername, i0->servername.buffer, sizeof(servername), -1,STR_TERMINATE);
+  
        printf("\tprintername:[%s]\n", name);
-       printf("\tservername:[%s]\n", the_server);
-       printf("\tcjobs:[0x%x]\n", i1->cjobs);
-       printf("\ttotal_jobs:[0x%x]\n", i1->total_jobs);
+       printf("\tservername:[%s]\n", servername);
+       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);
+
+       printf("\n");
 }
 
 /****************************************************************************
@@ -245,18 +200,22 @@ 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 = "";
 
-       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);
+       rpcstr_pull(desc, i1->description.buffer, sizeof(desc), -1,
+                   STR_TERMINATE);
+
+       rpcstr_pull(name, i1->name.buffer, sizeof(name), -1, STR_TERMINATE);
+       rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), -1, STR_TERMINATE);
 
        printf("\tflags:[0x%x]\n", i1->flags);
        printf("\tname:[%s]\n", name);
        printf("\tdescription:[%s]\n", desc);
-       printf("\tcomment:[%s]\n\n", comm);
+       printf("\tcomment:[%s]\n", comm);
+
+       printf("\n");
 }
 
 /****************************************************************************
@@ -264,35 +223,39 @@ 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);
+       rpcstr_pull(servername, i2->servername.buffer,sizeof(servername), -1, STR_TERMINATE);
+
+       rpcstr_pull(printername, i2->printername.buffer,sizeof(printername), -1, STR_TERMINATE);
+
+       rpcstr_pull(sharename, i2->sharename.buffer,sizeof(sharename), -1, STR_TERMINATE);
+
+       rpcstr_pull(portname, i2->portname.buffer,sizeof(portname), -1, STR_TERMINATE);
+
+       rpcstr_pull(drivername, i2->drivername.buffer,sizeof(drivername), -1, STR_TERMINATE);
+
+       rpcstr_pull(comment, i2->comment.buffer,sizeof(comment), -1, STR_TERMINATE);
+
+       rpcstr_pull(location, i2->location.buffer,sizeof(location), -1, STR_TERMINATE);
+
+       rpcstr_pull(sepfile, i2->sepfile.buffer,sizeof(sepfile), -1, STR_TERMINATE);
+
+       rpcstr_pull(printprocessor, i2->printprocessor.buffer,sizeof(printprocessor), -1, STR_TERMINATE);
+
+       rpcstr_pull(datatype, i2->datatype.buffer,sizeof(datatype), -1, STR_TERMINATE);
+
+       rpcstr_pull(parameters, i2->parameters.buffer,sizeof(parameters), -1, STR_TERMINATE);
 
        printf("\tservername:[%s]\n", servername);
        printf("\tprintername:[%s]\n", printername);
@@ -314,7 +277,10 @@ static void display_print_info_2(PRINTER_INFO_2 *i2)
        printf("\tcjobs:[0x%x]\n", i2->cjobs);
        printf("\taverageppm:[0x%x]\n", i2->averageppm);
 
-       if (i2->secdesc) display_sec_desc(i2->secdesc);
+       if (i2->secdesc) 
+               display_sec_desc(i2->secdesc);
+
+       printf("\n");
 }
 
 /****************************************************************************
@@ -325,69 +291,80 @@ static void display_print_info_3(PRINTER_INFO_3 *i3)
        printf("\tflags:[0x%x]\n", i3->flags);
 
        display_sec_desc(i3->secdesc);
+
+       printf("\n");
 }
 
 /* Enumerate printers */
 
-static uint32 cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char **argv)
+static WERROR cmd_spoolss_enum_printers(struct cli_state *cli, 
+                                          TALLOC_CTX *mem_ctx,
+                                          int argc, const char **argv)
 {
-       uint32                  result = NT_STATUS_UNSUCCESSFUL, 
-                               info_level = 1;
+       WERROR                  result;
+       uint32                  info_level = 1;
        PRINTER_INFO_CTR        ctr;
-       int                     returned;
-       uint32                  i;
-       
-       if (argc > 2
+       uint32                  i = 0, num_printers, needed;
+       fstring name;
+
+       if (argc > 3
        {
-               printf("Usage: enumprinters [level]\n");
-               return NT_STATUS_NOPROBLEMO;
+               printf("Usage: %s [level] [name]\n", argv[0]);
+               return WERR_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;
+       if (argc == 3)
+               fstrcpy(name, argv[2]);
+       else {
+               slprintf(name, sizeof(name)-1, "\\\\%s", cli->desthost);
+               strupper(name);
        }
 
        /* 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, PRINTER_ENUM_LOCAL, 
-                                          info_level, &returned, &ctr);
-
-       if (result == NT_STATUS_NOPROBLEMO) {
-               switch(info_level) {
-               case 0:
-                       for (i=0; i<returned; 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]));
-                       }
-                       break;
-               case 2:
-                       for (i=0; i<returned; 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]));
+
+       result = cli_spoolss_enum_printers(
+               cli, mem_ctx, 0, &needed, name, PRINTER_ENUM_LOCAL, 
+               info_level, &num_printers, &ctr);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_enum_printers(
+                       cli, mem_ctx, needed, NULL, name, PRINTER_ENUM_LOCAL, 
+                       info_level, &num_printers, &ctr);
+
+       if (W_ERROR_IS_OK(result)) {
+
+               if (!num_printers) {
+                       printf ("No printers returned.\n");
+                       goto done;
+               }
+       
+               for (i = 0; i < num_printers; i++) {
+                       switch(info_level) {
+                       case 0:
+                               display_print_info_0(&ctr.printers_0[i]);
+                               break;
+                       case 1:
+                               display_print_info_1(&ctr.printers_1[i]);
+                               break;
+                       case 2:
+                               display_print_info_2(&ctr.printers_2[i]);
+                               break;
+                       case 3:
+                               display_print_info_3(&ctr.printers_3[i]);
+                               break;
+                       default:
+                               printf("unknown info level %d\n", info_level);
+                               goto done;
                        }
-                       break;
-               default:
-                       printf("unknown info level %d\n", info_level);
-                       break;
                }
        }
-
-       cli_nt_session_close(cli);
+       done:
 
        return result;
 }
@@ -399,7 +376,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), -1, STR_TERMINATE);
        printf("\tPort Name:\t[%s]\n", buffer);
 }
 
@@ -410,11 +387,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), -1, 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), -1, 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), -1, STR_TERMINATE);
+
        printf("\tDescription:\t[%s]\n", buffer);
        printf("\tPort Type:\t[%d]\n", i2->port_type);
        printf("\tReserved:\t[%d]\n", i2->reserved);
@@ -423,41 +402,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 WERROR cmd_spoolss_enum_ports(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx, int argc, 
+                                      const char **argv)
 {
-       uint32                  result = NT_STATUS_UNSUCCESSFUL, 
-                               info_level = 1;
+       WERROR                  result;
+       uint32                  needed, info_level = 1;
        PORT_INFO_CTR           ctr;
        int                     returned;
        
        if (argc > 2) {
-               printf("Usage: enumports [level]\n");
-               return NT_STATUS_NOPROBLEMO;
+               printf("Usage: %s [level]\n", argv[0]);
+               return WERR_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, info_level, &returned, &ctr);
+       result = cli_spoolss_enum_ports(cli, mem_ctx, 0, &needed, info_level, 
+                                       &returned, &ctr);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_enum_ports(cli, mem_ctx, needed, NULL,
+                                               info_level, &returned, &ctr);
 
-       if (result == NT_STATUS_NOPROBLEMO) {
+       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;
@@ -467,8 +447,76 @@ static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **arg
                        }
                }
        }
+       
+       return result;
+}
+
+/***********************************************************************
+ * Set printer comment - use a level2 set.
+ */
+static WERROR cmd_spoolss_setprinter(struct cli_state *cli,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc, const char **argv)
+{
+       POLICY_HND      pol;
+       WERROR          result;
+       uint32          needed;
+       uint32          info_level = 2;
+       BOOL            opened_hnd = False;
+       PRINTER_INFO_CTR ctr;
+       fstring         printername,
+                       servername,
+                       user,
+                       comment;
+
+       if (argc == 1 || argc > 3) {
+               printf("Usage: %s printername comment\n", argv[0]);
+
+               return WERR_OK;
+       }
+
+       /* Open a printer handle */
+       if (argc == 3) {
+               fstrcpy(comment, argv[2]);
+       }
+
+       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper (servername);
+       fstrcpy (printername, argv[1]);
+       fstrcpy  (user, cli->user_name);
+
+       /* get a printer handle */
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                               MAXIMUM_ALLOWED_ACCESS, servername,
+                               user, &pol);
+                               
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       opened_hnd = True;
+
+       /* Get printer info */
+        result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, &pol, info_level, &ctr);
+
+        if (W_ERROR_V(result) == ERRinsufficientbuffer)
+                result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, info_level, &ctr);
+
+        if (!W_ERROR_IS_OK(result))
+                goto done;
 
-       cli_nt_session_close(cli);
+
+       /* Modify the comment. */
+       init_unistr(&ctr.printers_2->comment, comment);
+       ctr.printers_2->devmode = NULL;
+       ctr.printers_2->secdesc = NULL;
+
+       result = cli_spoolss_setprinter(cli, mem_ctx, &pol, info_level, &ctr, 0);
+       if (W_ERROR_IS_OK(result))
+               printf("Success in setting comment.\n");
+
+ done:
+       if (opened_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
        return result;
 }
@@ -476,26 +524,23 @@ static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **arg
 /***********************************************************************
  * Get printer information
  */
-static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **argv)
+static WERROR cmd_spoolss_getprinter(struct cli_state *cli,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc, const char **argv)
 {
        POLICY_HND      pol;
-       uint32          result, 
-                       info_level = 1;
+       WERROR          result;
+       uint32          info_level = 1;
        BOOL            opened_hnd = False;
        PRINTER_INFO_CTR ctr;
-       fstring         printername, 
+       fstring         printername,
                        servername,
-                       username;
+                       user;
+       uint32 needed;
 
        if (argc == 1 || argc > 3) {
-               printf("Usage: %s printername [level]\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;
+               printf("Usage: %s <printername> [level]\n", argv[0]);
+               return WERR_OK;
        }
 
        /* Open a printer handle */
@@ -503,25 +548,33 @@ static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **arg
                info_level = atoi(argv[2]);
        }
 
-       slprintf (servername, sizeof(fstring), "\\\\%s", cli->desthost);
+       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
        strupper (servername);
-       slprintf (printername, sizeof(fstring), "\\\\%s\\%s", servername, argv[1]);
-       fstrcpy  (username, cli->user_name);
+       slprintf (printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy  (user, cli->user_name);
        
        /* get a printer handle */
-       if ((result = cli_spoolss_open_printer_ex(
-               cli, printername, "", MAXIMUM_ALLOWED_ACCESS, servername,
-               username, &pol)) != NT_STATUS_NOPROBLEMO) {
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &pol);
+
+       if (!W_ERROR_IS_OK(result))
                goto done;
-       }
  
        opened_hnd = True;
 
        /* Get printer info */
-       if ((result = cli_spoolss_getprinter(cli, &pol, info_level, &ctr))
-           != NT_STATUS_NOPROBLEMO) {
+
+       result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed,
+                                       &pol, info_level, &ctr);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_getprinter(
+                       cli, mem_ctx, needed, NULL, &pol, info_level, &ctr);
+
+       if (!W_ERROR_IS_OK(result))
                goto done;
-       }
 
        /* Display printer info */
 
@@ -545,9 +598,190 @@ static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **arg
 
  done: 
        if (opened_hnd) 
-               cli_spoolss_close_printer(cli, &pol);
+               cli_spoolss_close_printer(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+static void display_reg_value(REGISTRY_VALUE value)
+{
+       pstring text;
+
+       switch(value.type) {
+       case REG_DWORD:
+               printf("%s: REG_DWORD: 0x%08x\n", value.valuename, 
+                      *((uint32 *) value.data_p));
+               break;
+       case REG_SZ:
+               rpcstr_pull(text, value.data_p, sizeof(text), value.size,
+                           STR_TERMINATE);
+               printf("%s: REG_SZ: %s\n", value.valuename, text);
+               break;
+       case REG_BINARY:
+               printf("%s: REG_BINARY: unknown length value not displayed\n",
+                      value.valuename);
+               break;
+       case REG_MULTI_SZ: {
+               uint16 *curstr = (uint16 *) value.data_p;
+               uint8 *start = value.data_p;
+               printf("%s: REG_MULTI_SZ:\n", value.valuename);
+               while ((*curstr != 0) && 
+                      ((uint8 *) curstr < start + value.size)) {
+                       rpcstr_pull(text, curstr, sizeof(text), -1, 
+                                   STR_TERMINATE);
+                       printf("  %s\n", text);
+                       curstr += strlen(text) + 1;
+               }
+       }
+       break;
+       default:
+               printf("%s: unknown type %d\n", value.valuename, value.type);
+       }
+       
+}
+
+/***********************************************************************
+ * Get printer data
+ */
+static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli,
+                                          TALLOC_CTX *mem_ctx,
+                                          int argc, const char **argv)
+{
+       POLICY_HND      pol;
+       WERROR          result;
+       BOOL            opened_hnd = False;
+       fstring         printername,
+                       servername,
+                       user;
+       uint32 needed;
+       const char *valuename;
+       REGISTRY_VALUE value;
+
+       if (argc != 3) {
+               printf("Usage: %s <printername> <valuename>\n", argv[0]);
+               printf("<printername> of . queries print server\n");
+               return WERR_OK;
+       }
+       valuename = argv[2];
+
+       /* Open a printer handle */
+
+       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper (servername);
+       if (strncmp(argv[1], ".", sizeof(".")) == 0)
+               fstrcpy(printername, servername);
+       else
+               slprintf (printername, sizeof(servername)-1, "%s\\%s", 
+                         servername, argv[1]);
+       fstrcpy  (user, cli->user_name);
+       
+       /* get a printer handle */
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &pol);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+       opened_hnd = True;
+
+       /* Get printer info */
+
+       result = cli_spoolss_getprinterdata(cli, mem_ctx, 0, &needed,
+                                           &pol, valuename, &value);
+
+       if (W_ERROR_V(result) == ERRmoredata)
+               result = cli_spoolss_getprinterdata(
+                       cli, mem_ctx, needed, NULL, &pol, valuename, &value);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       /* Display printer data */
+
+       fstrcpy(value.valuename, valuename);
+       display_reg_value(value);
+       
+
+ done: 
+       if (opened_hnd) 
+               cli_spoolss_close_printer(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+/***********************************************************************
+ * Get printer data
+ */
+static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli,
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc, const char **argv)
+{
+       POLICY_HND      pol;
+       WERROR          result;
+       BOOL            opened_hnd = False;
+       fstring         printername,
+                       servername,
+                       user;
+       uint32 needed;
+       const char *valuename, *keyname;
+       REGISTRY_VALUE value;
+
+       if (argc != 4) {
+               printf("Usage: %s <printername> <keyname> <valuename>\n", 
+                      argv[0]);
+               printf("<printername> of . queries print server\n");
+               return WERR_OK;
+       }
+       valuename = argv[3];
+       keyname = argv[2];
+
+       /* Open a printer handle */
+
+       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper (servername);
+       if (strncmp(argv[1], ".", sizeof(".")) == 0)
+               fstrcpy(printername, servername);
+       else
+               slprintf (printername, sizeof(printername)-1, "%s\\%s", 
+                         servername, argv[1]);
+       fstrcpy  (user, cli->user_name);
+       
+       /* get a printer handle */
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &pol);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+       opened_hnd = True;
+
+       /* Get printer info */
+
+       result = cli_spoolss_getprinterdataex(cli, mem_ctx, 0, &needed,
+                                             &pol, keyname, valuename, 
+                                             &value);
+
+       if (W_ERROR_V(result) == ERRmoredata)
+               result = cli_spoolss_getprinterdataex(cli, mem_ctx, needed, 
+                                                     NULL, &pol, keyname,
+                                                     valuename, &value);
 
-       cli_nt_session_close(cli);
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       /* Display printer data */
+
+       fstrcpy(value.valuename, valuename);
+       display_reg_value(value);
+       
+
+ done: 
+       if (opened_hnd) 
+               cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
        return result;
 }
@@ -561,7 +795,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), -1, STR_TERMINATE);
 
        printf ("Printer Driver Info 1:\n");
        printf ("\tDriver Name: [%s]\n\n", name);
@@ -582,11 +816,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), -1, STR_TERMINATE);
+       rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), -1, STR_TERMINATE);
+       rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), -1, STR_TERMINATE);
+       rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), -1, STR_TERMINATE);
+       rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), -1, STR_TERMINATE);
 
        printf ("Printer Driver Info 2:\n");
        printf ("\tVersion: [%x]\n", i1->version);
@@ -604,15 +838,15 @@ printer info level 2 display function
 ****************************************************************************/
 static void display_print_driver_3(DRIVER_INFO_3 *i1)
 {
-       fstring name;
-       fstring architecture;
-       fstring driverpath;
-       fstring datafile;
-       fstring configfile;
-       fstring helpfile;
-       fstring dependentfiles;
-       fstring monitorname;
-       fstring defaultdatatype;
+       fstring name = "";
+       fstring architecture = "";
+       fstring driverpath = "";
+       fstring datafile = "";
+       fstring configfile = "";
+       fstring helpfile = "";
+       fstring dependentfiles = "";
+       fstring monitorname = "";
+       fstring defaultdatatype = "";
        
        int length=0;
        BOOL valid = True;
@@ -620,19 +854,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), -1, STR_TERMINATE);
+       rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), -1, STR_TERMINATE);
+       rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), -1, STR_TERMINATE);
+       rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), -1, STR_TERMINATE);
+       rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), -1, STR_TERMINATE);
+       rpcstr_pull(helpfile, i1->helpfile.buffer, sizeof(helpfile), -1, STR_TERMINATE);
+       rpcstr_pull(monitorname, i1->monitorname.buffer, sizeof(monitorname), -1, STR_TERMINATE);
+       rpcstr_pull(defaultdatatype, i1->defaultdatatype.buffer, sizeof(defaultdatatype), -1, 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);
@@ -641,7 +874,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), -1, STR_TERMINATE);
+               
                length+=strlen(dependentfiles)+1;
                
                if (strlen(dependentfiles) > 0)
@@ -665,74 +899,67 @@ 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 WERROR cmd_spoolss_getdriver(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx,
+                                      int argc, const char **argv)
 {
        POLICY_HND      pol;
-       uint32          result, 
-                       info_level = 3;
+       WERROR          werror;
+       uint32          info_level = 3;
        BOOL            opened_hnd = False;
        PRINTER_DRIVER_CTR      ctr;
        fstring         printername, 
-                       server, 
+                       servername
                        user;
        uint32          i;
 
        if ((argc == 1) || (argc > 3)) 
        {
                printf("Usage: %s <printername> [level]\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;
+               return WERR_OK;
        }
 
        /* get the arguments need to open the printer handle */
-       slprintf (server, sizeof(fstring), "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper (servername);
        fstrcpy  (user, cli->user_name);
        fstrcpy  (printername, argv[1]);
        if (argc == 3)
                info_level = atoi(argv[2]);
 
        /* Open a printer handle */
-       if ((result=cli_spoolss_open_printer_ex (cli, printername, "", 
-                   MAXIMUM_ALLOWED_ACCESS, server, user, &pol)) != NT_STATUS_NO_PROBLEMO) 
-       {
-               printf ("Error opening printer handle for %s!\n", printername);
-               return result;
+
+       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                                            PRINTER_ACCESS_USE,
+                                            servername, user, &pol);
+
+       if (!W_ERROR_IS_OK(werror)) {
+               printf("Error opening printer handle for %s!\n", printername);
+               return werror;
        }
 
        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, &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;
@@ -746,51 +973,35 @@ 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, &pol);
-       cli_nt_session_close (cli);
+               cli_spoolss_close_printer (cli, mem_ctx, &pol);
        
-       if (result==ERROR_UNKNOWN_PRINTER_DRIVER)
-               return NT_STATUS_NO_PROBLEMO;
-       else 
-               return result;
-               
+       return werror;
 }
 
 /***********************************************************************
  * Get printer information
  */
-static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **argv)
+static WERROR cmd_spoolss_enum_drivers(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, const char **argv)
 {
-       uint32          result, 
-                       info_level = 1;
+       WERROR werror;
+       uint32          info_level = 1;
        PRINTER_DRIVER_CTR      ctr;
-       fstring         server;
        uint32          i, j,
                        returned;
 
        if (argc > 2) 
        {
                printf("Usage: enumdrivers [level]\n");
-               return NT_STATUS_NOPROBLEMO;
+               return WERR_OK;
        }
 
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       /* get the arguments need to open the printer handle */
-       slprintf (server, sizeof(fstring), "\\\\%s", cli->desthost);
-       strupper (server);
        if (argc == 2)
                info_level = atoi(argv[1]);
 
@@ -798,18 +1009,23 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a
        /* loop through and print driver info level for each architecture */
        for (i=0; archi_table[i].long_archi!=NULL; i++) 
        {
-               returned = 0;   
-               result = cli_spoolss_enumprinterdrivers (cli, info_level, 
+               uint32 needed;
+
+               werror = cli_spoolss_enumprinterdrivers(
+                       cli, mem_ctx, 0, &needed, info_level, 
+                       archi_table[i].long_archi, &returned, &ctr);
+
+               if (W_ERROR_V(werror) == ERRinsufficientbuffer)
+                       werror = cli_spoolss_enumprinterdrivers(
+                               cli, mem_ctx, needed, NULL, info_level, 
                                archi_table[i].long_archi, &returned, &ctr);
 
                if (returned == 0)
                        continue;
                        
-
-               if (result != NT_STATUS_NO_PROBLEMO)
-               {
-                       printf ("Error getting driver for environment [%s] - %s\n",
-                               archi_table[i].long_archi, get_nt_error_msg(result));
+               if (!W_ERROR_IS_OK(werror)) {
+                       printf ("Error getting driver for environment [%s] - %d\n",
+                               archi_table[i].long_archi, W_ERROR_V(werror));
                        continue;
                }
                
@@ -838,15 +1054,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a
                }
        }
        
-
-       /* cleanup */
-       cli_nt_session_close (cli);
-       
-       if (result==ERROR_UNKNOWN_PRINTER_DRIVER)
-               return NT_STATUS_NO_PROBLEMO;
-       else 
-               return result;
-               
+       return werror;
 }
 
 /****************************************************************************
@@ -858,7 +1066,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), -1, STR_TERMINATE);
  
        printf ("\tDirectory Name:[%s]\n", name);
 }
@@ -866,46 +1074,40 @@ 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 WERROR cmd_spoolss_getdriverdir(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, const char **argv)
 {
-       uint32                  result;
+       WERROR result;
        fstring                 env;
        DRIVER_DIRECTORY_CTR    ctr;
+       uint32 needed;
 
-       if (argc > 2) 
-       {
+       if (argc > 2) {
                printf("Usage: %s [environment]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return WERR_OK;
        }
 
-       /* Initialise RPC connection */
-       if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) 
-       {
-               fprintf (stderr, "Could not initialize spoolss pipe!\n");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       /* Get the arguments need to open the printer handle */
 
-       /* get the arguments need to open the printer handle */
        if (argc == 2)
                fstrcpy (env, argv[1]);
        else
                fstrcpy (env, "Windows NT x86");
 
        /* Get the directory.  Only use Info level 1 */
-       if ((result = cli_spoolss_getprinterdriverdir (cli, 1, env, &ctr)) 
-            != NT_STATUS_NO_PROBLEMO)
-       {
-               return result;
-       }
 
-       
-       display_printdriverdir_1 (ctr.info1);
+       result = cli_spoolss_getprinterdriverdir(
+               cli, mem_ctx, 0, &needed, 1, env, &ctr);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_getprinterdriverdir(
+                       cli, mem_ctx, needed, NULL, 1, env, &ctr);
+
+       if (W_ERROR_IS_OK(result))
+               display_printdriverdir_1(ctr.info1);
 
-       /* cleanup */
-       cli_nt_session_close (cli);
-       
        return result;
-               
 }
 
 /*******************************************************************************
@@ -939,7 +1141,7 @@ void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch)
  wrapper for strtok to get the next parameter from a delimited list.
  Needed to handle the empty parameter string denoted by "NULL"
  *************************************************************************/
-static char* get_driver_3_param (char* str, char* delim, UNISTR* dest)
+static char* get_driver_3_param (const char* str, const char* delim, UNISTR* dest)
 {
        char    *ptr;
 
@@ -950,7 +1152,7 @@ static char* get_driver_3_param (char* str, char* delim, UNISTR* dest)
           parameter because two consecutive delimiters
           will not return an empty string.  See man strtok(3)
           for details */
-       if (StrCaseCmp(ptr, "NULL") == 0)
+       if (ptr && (StrCaseCmp(ptr, "NULL") == 0))
                ptr = NULL;
 
        if (dest != NULL)
@@ -966,7 +1168,11 @@ static char* get_driver_3_param (char* str, char* delim, UNISTR* dest)
             <Config File Name>:<Help File Name>:<Language Monitor Name>:\
             <Default Data Type>:<Comma Separated list of Files> 
  *******************************************************************************/
-static BOOL init_drv_info_3_members (DRIVER_INFO_3 *info, char *args)
+static BOOL init_drv_info_3_members (
+       TALLOC_CTX *mem_ctx, 
+       DRIVER_INFO_3 *info, 
+       const char *args
+)
 {
        char    *str, *str2;
        uint32  len, i;
@@ -997,14 +1203,14 @@ static BOOL init_drv_info_3_members (DRIVER_INFO_3 *info, char *args)
        /* allocate the space; add one extra slot for a terminating NULL.
           Each filename is NULL terminated and the end contains a double
           NULL */
-       if ((info->dependentfiles=(uint16*)malloc((len+1)*sizeof(uint16))) == NULL)
+       if ((info->dependentfiles=(uint16*)talloc(mem_ctx, (len+1)*sizeof(uint16))) == NULL)
        {
                DEBUG(0,("init_drv_info_3_members: Unable to malloc memory for dependenfiles\n"));
                return False;
        }
        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';
 
@@ -1012,13 +1218,15 @@ static BOOL init_drv_info_3_members (DRIVER_INFO_3 *info, char *args)
 }
 
 
-static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, char **argv)
+static WERROR cmd_spoolss_addprinterdriver(struct cli_state *cli, 
+                                             TALLOC_CTX *mem_ctx,
+                                             int argc, const char **argv)
 {
-       uint32                  result,
-                               level = 3;
+       WERROR result;
+       uint32                  level = 3;
        PRINTER_DRIVER_CTR      ctr;
        DRIVER_INFO_3           info3;
-       fstring                 arch;
+       const char              *arch;
        fstring                 driver_name;
 
        /* parse the command arguements */
@@ -1029,83 +1237,64 @@ 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 WERR_OK;
         }
-
-       /* 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);
-       if (!get_short_archi(arch, argv[1]))
+       if (!(arch = cmd_spoolss_get_short_archi(argv[1])))
        {
                printf ("Error Unknown architechture [%s]\n", argv[1]);
-               return NT_STATUS_INVALID_PARAMETER;
+               return WERR_INVALID_PARAM;
        }
        else
                set_drv_info_3_env(&info3, arch);
 
-       if (!init_drv_info_3_members(&info3, argv[2]))
+       if (!init_drv_info_3_members(mem_ctx, &info3, argv[2]))
        {
                printf ("Error Invalid parameter list - %s.\n", argv[2]);
-               return NT_STATUS_INVALID_PARAMETER;
+               return WERR_INVALID_PARAM;
        }
 
 
-       /* Get the directory.  Only use Info level 1 */
        ctr.info3 = &info3;
-       if ((result = cli_spoolss_addprinterdriver (cli, level, &ctr)) 
-            != NT_STATUS_NO_PROBLEMO)
-       {
-               return result;
-       }
+       result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr);
 
-       unistr_to_ascii (driver_name, info3.name.buffer, sizeof(driver_name)-1);
-       printf ("Printer Driver %s successfully installed.\n", driver_name);
+       if (W_ERROR_IS_OK(result)) {
+               rpcstr_pull(driver_name, info3.name.buffer, 
+                           sizeof(driver_name), -1, STR_TERMINATE);
+               printf ("Printer Driver %s successfully installed.\n",
+                       driver_name);
+       }
 
-       /* cleanup */
-       cli_nt_session_close (cli);
-       
        return result;
-               
 }
 
 
-static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char **argv)
+static WERROR cmd_spoolss_addprinterex(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, const char **argv)
 {
-       uint32                  result,
-                               level = 2;
+       WERROR result;
+       uint32                  level = 2;
        PRINTER_INFO_CTR        ctr;
        PRINTER_INFO_2          info2;
-       fstring                 server;
+       fstring                 servername;
        
        /* parse the command arguements */
        if (argc != 5)
        {
                printf ("Usage: %s <name> <shared name> <driver> <port>\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return WERR_OK;
         }
+       
+        slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+        strupper (servername);
 
-        slprintf (server, sizeof(fstring), "\\\\%s", cli->desthost);
-        strupper (server);
-
-       /* 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 */
-       init_unistr( &info2.servername,         server);
+       init_unistr( &info2.servername,         servername);
 #endif
        init_unistr( &info2.printername,        argv[1]);
        init_unistr( &info2.sharename,          argv[2]);
@@ -1130,41 +1319,975 @@ static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char **
        info2.averageppm        = 0;
        */
 
+       ctr.printers_2 = &info2;
+       result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr);
 
+       if (W_ERROR_IS_OK(result))
+               printf ("Printer %s successfully installed.\n", argv[1]);
 
-       /* Get the directory.  Only use Info level 1 */
+       return result;
+}
+
+static WERROR cmd_spoolss_setdriver(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx,
+                                      int argc, const char **argv)
+{
+       POLICY_HND              pol;
+       WERROR                  result;
+       uint32                  level = 2;
+       BOOL                    opened_hnd = False;
+       PRINTER_INFO_CTR        ctr;
+       PRINTER_INFO_2          info2;
+       fstring                 servername,
+                               printername,
+                               user;
+       uint32 needed;
+       
+       /* parse the command arguements */
+       if (argc != 3)
+       {
+               printf ("Usage: %s <printer> <driver>\n", argv[0]);
+               return WERR_OK;
+        }
+
+       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper (servername);
+       slprintf (printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy  (user, cli->user_name);
+
+       /* Get a printer handle */
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                                            PRINTER_ALL_ACCESS,
+                                            servername, user, &pol);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       opened_hnd = True;
+
+       /* Get printer info */
+
+       ZERO_STRUCT (info2);
        ctr.printers_2 = &info2;
-       if ((result = cli_spoolss_addprinterex (cli, level, &ctr)) 
-            != NT_STATUS_NO_PROBLEMO)
+
+       result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed,
+                                       &pol, level, &ctr);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_getprinter(
+                       cli, mem_ctx, needed, NULL, &pol, level, &ctr);
+
+       if (!W_ERROR_IS_OK(result)) {
+               printf ("Unable to retrieve printer information!\n");
+               goto done;
+       }
+
+       /* Set the printer driver */
+
+       init_unistr(&ctr.printers_2->drivername, argv[2]);
+
+       result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0);
+
+       if (!W_ERROR_IS_OK(result)) {
+               printf("SetPrinter call failed!\n");
+               goto done;;
+       }
+
+       printf("Succesfully set %s to driver %s.\n", argv[1], argv[2]);
+
+done:
+       /* Cleanup */
+
+       if (opened_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+
+static WERROR cmd_spoolss_deletedriver(struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, const char **argv)
+{
+       WERROR result;
+       fstring                 servername;
+       int                     i;
+       
+       /* parse the command arguements */
+       if (argc != 2)
        {
-               return result;
+               printf ("Usage: %s <driver>\n", argv[0]);
+               return WERR_OK;
+        }
+
+       slprintf (servername, sizeof(servername)-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 ( !W_ERROR_IS_OK(result) ) {
+                       if ( !W_ERROR_EQUAL(result, WERR_UNKNOWN_PRINTER_DRIVER) ) {
+                               printf ("Failed to remove driver %s for arch [%s] - error 0x%x!\n", 
+                                       argv[1], archi_table[i].long_archi, 
+                                       W_ERROR_V(result));
+                       }
+               } 
+               else 
+               {
+                       printf ("Driver %s removed for arch [%s].\n", argv[1], 
+                               archi_table[i].long_archi);
+               }
+       }
+               
+       return result;
+}
+
+static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli, 
+                                           TALLOC_CTX *mem_ctx,
+                                           int argc, const char **argv)
+{
+       WERROR result;
+       char *servername = NULL, *environment = NULL;
+       fstring procdir;
+       uint32 needed;
+       
+       /* parse the command arguements */
+       if (argc > 2) {
+               printf ("Usage: %s [environment]\n", argv[0]);
+               return WERR_OK;
+        }
+
+       if (asprintf(&servername, "\\\\%s", cli->desthost) < 0)
+               return WERR_NOMEM;
+       strupper(servername);
+
+       if (asprintf(&environment, "%s", (argc == 2) ? argv[1] : 
+                    PRINTER_DRIVER_ARCHITECTURE) < 0) {
+               SAFE_FREE(servername);
+               return WERR_NOMEM;
+       }
+
+       result = cli_spoolss_getprintprocessordirectory(
+               cli, mem_ctx, 0, &needed, servername, environment, procdir);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_getprintprocessordirectory(
+                       cli, mem_ctx, needed, NULL, servername, environment, 
+                       procdir);
+
+       if (W_ERROR_IS_OK(result))
+               printf("%s\n", procdir);
+
+       SAFE_FREE(servername);
+       SAFE_FREE(environment);
+
+       return result;
+}
+
+/* Add a form */
+
+static WERROR cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                                   int argc, const char **argv)
+{
+       POLICY_HND handle;
+       WERROR werror;
+       char *servername = NULL, *printername = NULL;
+       FORM form;
+       BOOL got_handle = False;
+       
+       /* Parse the command arguements */
+
+       if (argc != 3) {
+               printf ("Usage: %s <printer> <formname>\n", argv[0]);
+               return WERR_OK;
+        }
+       
+       /* Get a printer handle */
+
+       asprintf(&servername, "\\\\%s", cli->desthost);
+       strupper(servername);
+       asprintf(&printername, "%s\\%s", servername, argv[1]);
+
+       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                                            MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, cli->user_name, &handle);
+
+       if (!W_ERROR_IS_OK(werror))
+               goto done;
+
+       got_handle = True;
+
+       /* Dummy up some values for the form data */
+
+       form.flags = FORM_USER;
+       form.size_x = form.size_y = 100;
+       form.left = 0;
+       form.top = 10;
+       form.right = 20;
+       form.bottom = 30;
+
+       init_unistr2(&form.name, argv[2], strlen(argv[2]) + 1);
+
+       /* Add the form */
+
+
+       werror = cli_spoolss_addform(cli, mem_ctx, &handle, 1, &form);
+
+ done:
+       if (got_handle)
+               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+
+       SAFE_FREE(servername);
+       SAFE_FREE(printername);
+
+       return werror;
+}
+
+/* Set a form */
+
+static WERROR cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                                   int argc, const char **argv)
+{
+       POLICY_HND handle;
+       WERROR werror;
+       char *servername = NULL, *printername = NULL;
+       FORM form;
+       BOOL got_handle = False;
+       
+       /* Parse the command arguements */
+
+       if (argc != 3) {
+               printf ("Usage: %s <printer> <formname>\n", argv[0]);
+               return WERR_OK;
+        }
+       
+       /* Get a printer handle */
+
+       asprintf(&servername, "\\\\%s", cli->desthost);
+       strupper(servername);
+       asprintf(&printername, "%s\\%s", servername, argv[1]);
+
+       werror = cli_spoolss_open_printer_ex(
+               cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
+               servername, cli->user_name, &handle);
+
+       if (!W_ERROR_IS_OK(werror))
+               goto done;
+
+       got_handle = True;
+
+       /* Dummy up some values for the form data */
+
+       form.flags = FORM_PRINTER;
+       form.size_x = form.size_y = 100;
+       form.left = 0;
+       form.top = 1000;
+       form.right = 2000;
+       form.bottom = 3000;
+
+       init_unistr2(&form.name, argv[2], strlen(argv[2]) + 1);
+
+       /* Set the form */
+
+       werror = cli_spoolss_setform(cli, mem_ctx, &handle, 1, argv[2], &form);
+
+ done:
+       if (got_handle)
+               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+
+       SAFE_FREE(servername);
+       SAFE_FREE(printername);
+
+       return werror;
+}
+
+/* Get a form */
+
+static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                                   int argc, const char **argv)
+{
+       POLICY_HND handle;
+       WERROR werror;
+       char *servername = NULL, *printername = NULL;
+       FORM_1 form;
+       BOOL got_handle = False;
+       uint32 needed;
+       
+       /* Parse the command arguements */
+
+       if (argc != 3) {
+               printf ("Usage: %s <printer> <formname>\n", argv[0]);
+               return WERR_OK;
+        }
+       
+       /* Get a printer handle */
+
+       asprintf(&servername, "\\\\%s", cli->desthost);
+       strupper(servername);
+       asprintf(&printername, "%s\\%s", servername, argv[1]);
+
+       werror = cli_spoolss_open_printer_ex(
+               cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
+               servername, cli->user_name, &handle);
+
+       if (!W_ERROR_IS_OK(werror))
+               goto done;
+
+       got_handle = True;
+
+       /* Set the form */
+
+       werror = cli_spoolss_getform(cli, mem_ctx, 0, &needed,
+                                    &handle, argv[2], 1, &form);
+
+       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
+               werror = cli_spoolss_getform(cli, mem_ctx, needed, NULL,
+                                            &handle, argv[2], 1, &form);
+
+       if (!W_ERROR_IS_OK(werror))
+               goto done;
+
+       printf("width: %d\n", form.width);
+       printf("length: %d\n", form.length);
+       printf("left: %d\n", form.left);
+       printf("top: %d\n", form.top);
+       printf("right: %d\n", form.right);
+       printf("bottom: %d\n", form.bottom);
+
+ done:
+       if (got_handle)
+               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+
+       SAFE_FREE(servername);
+       SAFE_FREE(printername);
+
+       return werror;
+}
+
+/* Delete a form */
+
+static WERROR cmd_spoolss_deleteform(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx, int argc, 
+                                      const char **argv)
+{
+       POLICY_HND handle;
+       WERROR werror;
+       char *servername = NULL, *printername = NULL;
+       BOOL got_handle = False;
+       
+       /* Parse the command arguements */
+
+       if (argc != 3) {
+               printf ("Usage: %s <printer> <formname>\n", argv[0]);
+               return WERR_OK;
+        }
+       
+       /* Get a printer handle */
+
+       asprintf(&servername, "\\\\%s", cli->desthost);
+       strupper(servername);
+       asprintf(&printername, "%s\\%s", servername, argv[1]);
+
+       werror = cli_spoolss_open_printer_ex(
+               cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
+               servername, cli->user_name, &handle);
+
+       if (!W_ERROR_IS_OK(werror))
+               goto done;
+
+       got_handle = True;
+
+       /* Delete the form */
+
+       werror = cli_spoolss_deleteform(cli, mem_ctx, &handle, argv[2]);
+
+ done:
+       if (got_handle)
+               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+
+       SAFE_FREE(servername);
+       SAFE_FREE(printername);
+
+       return werror;
+}
+
+/* Enumerate forms */
+
+static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx, int argc, 
+                                      const char **argv)
+{
+       POLICY_HND handle;
+       WERROR werror;
+       char *servername = NULL, *printername = NULL;
+       BOOL got_handle = False;
+       uint32 needed, num_forms, level = 1, i;
+       FORM_1 *forms;
+       
+       /* Parse the command arguements */
+
+       if (argc != 2) {
+               printf ("Usage: %s <printer>\n", argv[0]);
+               return WERR_OK;
+        }
+       
+       /* Get a printer handle */
+
+       asprintf(&servername, "\\\\%s", cli->desthost);
+       strupper(servername);
+       asprintf(&printername, "%s\\%s", servername, argv[1]);
+
+       werror = cli_spoolss_open_printer_ex(
+               cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
+               servername, cli->user_name, &handle);
+
+       if (!W_ERROR_IS_OK(werror))
+               goto done;
+
+       got_handle = True;
+
+       /* Enumerate forms */
+
+       werror = cli_spoolss_enumforms(
+               cli, mem_ctx, 0, &needed, &handle, level, &num_forms, &forms);
+
+       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
+               werror = cli_spoolss_enumforms(
+                       cli, mem_ctx, needed, NULL, &handle, level, 
+                       &num_forms, &forms);
+
+       if (!W_ERROR_IS_OK(werror))
+               goto done;
+
+       /* Display output */
+
+       for (i = 0; i < num_forms; i++) {
+               fstring form_name;
+
+               if (forms[i].name.buffer)
+                       rpcstr_pull(form_name, forms[i].name.buffer,
+                                   sizeof(form_name), -1, STR_TERMINATE);
+
+               printf("%s\n", form_name);
+       }
+
+ done:
+       if (got_handle)
+               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+
+       SAFE_FREE(servername);
+       SAFE_FREE(printername);
+
+       return werror;
+}
+
+static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli,
+                                           TALLOC_CTX *mem_ctx,
+                                           int argc, const char **argv)
+{
+       WERROR result;
+       uint32 needed;
+       fstring servername, printername, user;
+       POLICY_HND pol;
+       BOOL opened_hnd = False;
+       PRINTER_INFO_CTR ctr;
+       PRINTER_INFO_0 info;
+       REGISTRY_VALUE value;
+
+       /* parse the command arguements */
+       if (argc != 4) {
+               printf ("Usage: %s <printer> <value> <data>\n", argv[0]);
+               return WERR_OK;
+        }
+
+       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper (servername);
+       slprintf (printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy  (user, cli->user_name);
+
+       /* get a printer handle */
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
+                                            MAXIMUM_ALLOWED_ACCESS, servername, 
+                                            user, &pol);
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       opened_hnd = True;
+
+       ctr.printers_0 = &info;
+
+        result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed,
+                                        &pol, 0, &ctr);
+
+        if (W_ERROR_V(result) == ERRinsufficientbuffer)
+                result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, 0, &ctr);
+
+        if (!W_ERROR_IS_OK(result))
+                goto done;
+               
+       printf("%s\n", timestring(True));
+       printf("\tchange_id (before set)\t:[0x%x]\n", info.change_id);
+
+       /* Set the printer data */
+       
+       fstrcpy(value.valuename, argv[2]);
+       value.type = REG_SZ;
+       value.size = strlen(argv[3]) + 1;
+       value.data_p = talloc_memdup(mem_ctx, argv[3], value.size);
+
+       result = cli_spoolss_setprinterdata(cli, mem_ctx, &pol, &value);
+               
+       if (!W_ERROR_IS_OK(result)) {
+               printf ("Unable to set [%s=%s]!\n", argv[2], argv[3]);
+               goto done;
        }
+       printf("\tSetPrinterData succeeded [%s: %s]\n", argv[2], argv[3]);
+
+        result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, &pol, 0, &ctr);
 
-       printf ("Printer %s successfully installed.\n", argv[1]);
+        if (W_ERROR_V(result) == ERRinsufficientbuffer)
+                result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, 0, &ctr);
 
+        if (!W_ERROR_IS_OK(result))
+                goto done;
+               
+       printf("%s\n", timestring(True));
+       printf("\tchange_id (after set)\t:[0x%x]\n", info.change_id);
+
+done:
        /* cleanup */
-       cli_nt_session_close (cli);
+       if (opened_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+static void display_job_info_1(JOB_INFO_1 *job)
+{
+       fstring username = "", document = "", text_status = "";
+
+       rpcstr_pull(username, job->username.buffer,
+                   sizeof(username), -1, STR_TERMINATE);
+
+       rpcstr_pull(document, job->document.buffer,
+                   sizeof(document), -1, STR_TERMINATE);
+
+       rpcstr_pull(text_status, job->text_status.buffer,
+                   sizeof(text_status), -1, STR_TERMINATE);
+
+       printf("%d: jobid[%d]: %s %s %s %d/%d pages\n", job->position, job->jobid,
+              username, document, text_status, job->pagesprinted,
+              job->totalpages);
+}
+
+static void display_job_info_2(JOB_INFO_2 *job)
+{
+       fstring username = "", document = "", text_status = "";
+
+       rpcstr_pull(username, job->username.buffer,
+                   sizeof(username), -1, STR_TERMINATE);
+
+       rpcstr_pull(document, job->document.buffer,
+                   sizeof(document), -1, STR_TERMINATE);
+
+       rpcstr_pull(text_status, job->text_status.buffer,
+                   sizeof(text_status), -1, STR_TERMINATE);
+
+       printf("%d: jobid[%d]: %s %s %s %d/%d pages, %d bytes\n", job->position, job->jobid,
+              username, document, text_status, job->pagesprinted,
+              job->totalpages, job->size);
+}
+
+/* Enumerate jobs */
+
+static WERROR cmd_spoolss_enum_jobs(struct cli_state *cli, 
+                                     TALLOC_CTX *mem_ctx, int argc, 
+                                     const char **argv)
+{
+       WERROR result;
+       uint32 needed, level = 1, num_jobs, i;
+       BOOL got_hnd = False;
+       pstring printername;
+       fstring servername, user;
+       POLICY_HND hnd;
+       JOB_INFO_CTR ctr;
+       
+       if (argc < 2 || argc > 3) {
+               printf("Usage: %s printername [level]\n", argv[0]);
+               return WERR_OK;
+       }
+       
+       if (argc == 3)
+               level = atoi(argv[2]);
+
+       /* Open printer handle */
+
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(servername)-1, "\\\\%s\\", cli->desthost);
+       strupper(printername);
+       pstrcat(printername, argv[1]);
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &hnd);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+       got_hnd = True;
+
+       /* Enumerate ports */
+
+       result = cli_spoolss_enumjobs(
+               cli, mem_ctx, 0, &needed, &hnd, level, 0, 1000,
+               &num_jobs, &ctr);
+
+       if (W_ERROR_V(result) == ERRinsufficientbuffer)
+               result = cli_spoolss_enumjobs(
+                       cli, mem_ctx, needed, NULL, &hnd, level, 0,
+                       1000, &num_jobs, &ctr);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       for (i = 0; i < num_jobs; i++) {
+               switch(level) {
+               case 1:
+                       display_job_info_1(&ctr.job.job_info_1[i]);
+                       break;
+               case 2:
+                       display_job_info_2(&ctr.job.job_info_2[i]);
+                       break;
+               default:
+                       d_printf("unknown info level %d\n", level);
+                       break;
+               }
+       }
        
+done:
+       if (got_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+       return result;
+}
+
+/* enumerate data */
+
+static WERROR cmd_spoolss_enum_data( struct cli_state *cli, 
+                                      TALLOC_CTX *mem_ctx, int argc, 
+                                      const char **argv)
+{
+       WERROR result;
+       uint32 i=0, val_needed, data_needed;
+       BOOL got_hnd = False;
+       pstring printername;
+       fstring servername, user;
+       POLICY_HND hnd;
+
+       if (argc != 2) {
+               printf("Usage: %s printername\n", argv[0]);
+               return WERR_OK;
+       }
+       
+       /* Open printer handle */
+
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->desthost);
+       strupper(printername);
+       pstrcat(printername, argv[1]);
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &hnd);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+       got_hnd = True;
+
+       /* Enumerate data */
+
+       result = cli_spoolss_enumprinterdata(cli, mem_ctx, &hnd, i, 0, 0,
+                                            &val_needed, &data_needed,
+                                            NULL);
+       while (W_ERROR_IS_OK(result)) {
+               REGISTRY_VALUE value;
+               result = cli_spoolss_enumprinterdata(
+                       cli, mem_ctx, &hnd, i++, val_needed,
+                       data_needed, 0, 0, &value);
+               if (W_ERROR_IS_OK(result))
+                       display_reg_value(value);
+       }
+       if (W_ERROR_V(result) == ERRnomoreitems)
+               result = W_ERROR(ERRsuccess);
+
+done:
+       if (got_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+       return result;
+}
+
+/* enumerate data for a given key */
+
+static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli, 
+                                         TALLOC_CTX *mem_ctx, int argc, 
+                                         const char **argv)
+{
+       WERROR result;
+       uint32 needed, i;
+       BOOL got_hnd = False;
+       pstring printername;
+       fstring servername, user;
+       const char *keyname = NULL;
+       POLICY_HND hnd;
+       REGVAL_CTR ctr;
+
+       if (argc != 3) {
+               printf("Usage: %s printername <keyname>\n", argv[0]);
+               return WERR_OK;
+       }
+       
+       keyname = argv[2];
+
+       /* Open printer handle */
+
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->desthost);
+       strupper(printername);
+       pstrcat(printername, argv[1]);
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &hnd);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+       got_hnd = True;
+
+       /* Enumerate subkeys */
+
+       result = cli_spoolss_enumprinterdataex(
+               cli, mem_ctx, 0, &needed, &hnd, keyname, NULL);
+
+       if (W_ERROR_V(result) == ERRmoredata)
+               result = cli_spoolss_enumprinterdataex(
+                       cli, mem_ctx, needed, NULL, &hnd, keyname, &ctr);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       for (i=0; i < ctr.num_values; i++) {
+               display_reg_value(*(ctr.values[i]));
+       }
+
+       regval_ctr_destroy(&ctr);
+
+done:
+       if (got_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+       return result;
+}
+
+/* enumerate subkeys */
+
+static WERROR cmd_spoolss_enum_printerkey( struct cli_state *cli, 
+                                            TALLOC_CTX *mem_ctx, int argc, 
+                                            const char **argv)
+{
+       WERROR result;
+       uint32 needed, returned;
+       BOOL got_hnd = False;
+       pstring printername;
+       fstring servername, user;
+       const char *keyname = NULL;
+       POLICY_HND hnd;
+       uint16 *keylist = NULL, *curkey;
+
+       if (argc < 2 || argc > 3) {
+               printf("Usage: %s printername [keyname]\n", argv[0]);
+               return WERR_OK;
+       }
+       
+       if (argc == 3)
+               keyname = argv[2];
+       else
+               keyname = "";
+
+       /* Open printer handle */
+
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->desthost);
+       strupper(printername);
+       pstrcat(printername, argv[1]);
+
+       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+                                            "", MAXIMUM_ALLOWED_ACCESS, 
+                                            servername, user, &hnd);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+       got_hnd = True;
+
+       /* Enumerate subkeys */
+
+       result = cli_spoolss_enumprinterkey(
+               cli, mem_ctx, 0, &needed, &hnd, keyname, NULL, NULL);
+
+       if (W_ERROR_V(result) == ERRmoredata)
+               result = cli_spoolss_enumprinterkey(
+                       cli, mem_ctx, needed, NULL, &hnd, keyname, &keylist,
+                       &returned);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       curkey = keylist;
+       while (*curkey != 0) {
+               pstring subkey;
+               rpcstr_pull(subkey, curkey, sizeof(subkey), -1, 
+                           STR_TERMINATE);
+               printf("%s\n", subkey);
+               curkey += strlen(subkey) + 1;
+       }
+
+       safe_free(keylist);
+
+done:
+       if (got_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
        return result;
-               
 }
 
+static WERROR cmd_spoolss_rffpcnex(struct cli_state *cli, 
+                                    TALLOC_CTX *mem_ctx, int argc, 
+                                    const char **argv)
+{
+       fstring servername, printername;
+       POLICY_HND hnd;
+       BOOL got_hnd = False;
+       WERROR result;
+       SPOOL_NOTIFY_OPTION option;
+
+       if (argc != 2) {
+               printf("Usage: %s printername\n", argv[0]);
+               result = WERR_OK;
+               goto done;
+       }
+
+       /* Open printer */
+
+       slprintf(servername, sizeof(servername) - 1, "\\\\%s", cli->desthost);
+       strupper(servername);
+
+       slprintf(printername, sizeof(printername) - 1, "\\\\%s\\%s", cli->desthost,
+                argv[1]);
+       strupper(printername);
+
+       result = cli_spoolss_open_printer_ex(
+               cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
+               servername, cli->user_name, &hnd);
+
+       if (!W_ERROR_IS_OK(result)) {
+               printf("Error opening %s\n", argv[1]);
+               goto done;
+       }
+
+       got_hnd = True;
+
+       /* Create spool options */
+
+       ZERO_STRUCT(option);
+
+       option.version = 2;
+       option.option_type_ptr = 1;
+       option.count = option.ctr.count = 2;
+
+       option.ctr.type = (SPOOL_NOTIFY_OPTION_TYPE *)talloc(
+               mem_ctx, sizeof(SPOOL_NOTIFY_OPTION_TYPE) * 2);
+
+       ZERO_STRUCT(option.ctr.type[0]);
+       option.ctr.type[0].type = PRINTER_NOTIFY_TYPE;
+       option.ctr.type[0].count = option.ctr.type[0].count2 = 1;
+       option.ctr.type[0].fields_ptr = 1;
+       option.ctr.type[0].fields[0] = PRINTER_NOTIFY_SERVER_NAME;
+
+       ZERO_STRUCT(option.ctr.type[1]);
+       option.ctr.type[1].type = JOB_NOTIFY_TYPE;
+       option.ctr.type[1].count = option.ctr.type[1].count2 = 1;
+       option.ctr.type[1].fields_ptr = 1;
+       option.ctr.type[1].fields[0] = JOB_NOTIFY_PRINTER_NAME;
+
+       /* Send rffpcnex */
+
+       slprintf(servername, sizeof(servername) - 1, "\\\\%s", myhostname());
+       strupper(servername);
+
+       result = cli_spoolss_rffpcnex(
+               cli, mem_ctx, &hnd, 0, 0, servername, 123, &option);
+
+       if (!W_ERROR_IS_OK(result)) {
+               printf("Error rffpcnex %s\n", argv[1]);
+               goto done;
+       }
+
+done:          
+       if (got_hnd)
+               cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+       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" },
-       { NULL, NULL, NULL }
+       { "SPOOLSS"  },
+
+       { "adddriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver,   PI_SPOOLSS, "Add a print driver",                  "" },
+       { "addprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex,       PI_SPOOLSS, "Add a printer",                       "" },
+       { "deldriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver,       PI_SPOOLSS, "Delete a printer driver",             "" },
+       { "enumdata",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,          PI_SPOOLSS, "Enumerate printer data",              "" },
+       { "enumdataex", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex,       PI_SPOOLSS, "Enumerate printer data for a key",    "" },
+       { "enumkey",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey,    PI_SPOOLSS, "Enumerate printer keys",              "" },
+       { "enumjobs",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,          PI_SPOOLSS, "Enumerate print jobs",                "" },
+       { "enumports",  RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,         PI_SPOOLSS, "Enumerate printer ports",             "" },
+       { "enumdrivers",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers,       PI_SPOOLSS, "Enumerate installed printer drivers", "" },
+       { "enumprinters",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers,      PI_SPOOLSS, "Enumerate printers",                  "" },
+       { "getdata",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata,     PI_SPOOLSS, "Get print driver data",               "" },
+       { "getdataex",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdataex,   PI_SPOOLSS, "Get printer driver data with keyname", ""},
+       { "getdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,          PI_SPOOLSS, "Get print driver information",        "" },
+       { "getdriverdir",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir,       PI_SPOOLSS, "Get print driver upload directory",   "" },
+       { "getprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,         PI_SPOOLSS, "Get printer info",                    "" },
+       { "getprintprocdir",RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    PI_SPOOLSS, "Get print processor directory",       "" },
+       { "openprinter",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex,    PI_SPOOLSS, "Open printer handle",                 "" },
+       { "setdriver",  RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,          PI_SPOOLSS, "Set printer driver",                  "" },
+       { "getprintprocdir",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    PI_SPOOLSS, "Get print processor directory",       "" },
+       { "addform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,            PI_SPOOLSS, "Add form",                            "" },
+       { "setform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,            PI_SPOOLSS, "Set form",                            "" },
+       { "getform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,            PI_SPOOLSS, "Get form",                            "" },
+       { "deleteform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,         PI_SPOOLSS, "Delete form",                         "" },
+       { "enumforms",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,         PI_SPOOLSS, "Enumerate forms",                     "" },
+       { "setprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,         PI_SPOOLSS, "Set printer comment",                 "" },
+       { "setprinterdata",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata,     PI_SPOOLSS, "Set REG_SZ printer data",             "" },
+       { "rffpcnex",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,           PI_SPOOLSS, "Rffpcnex test", "" },
+
+       { NULL }
 };