r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text
[tprouty/samba.git] / source / rpcclient / cmd_spoolss.c
index 22e2db41f313e156e57355eeeeecddb6c2bca9b1..1b0537f02727c284e3c555d9f08c6f87e52e43ea 100644 (file)
@@ -2,14 +2,14 @@
    Unix SMB/CIFS implementation.
    RPC pipe client
 
-   Copyright (C) Gerald Carter                     2001
+   Copyright (C) Gerald Carter                2001-2005
    Copyright (C) Tim Potter                        2000
    Copyright (C) Andrew Tridgell              1992-1999
    Copyright (C) Luke Kenneth Casson Leighton 1996-1999
  
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #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[]= {
+/* The version int is used by getdrivers.  Note that
+   all architecture strings that support mutliple
+   versions must be grouped together since enumdrivers
+   uses this property to prevent issuing multiple 
+   enumdriver calls for the same arch */
+
+
+static const struct table_node archi_table[]= {
 
        {"Windows 4.0",          "WIN40",       0 },
        {"Windows NT x86",       "W32X86",      2 },
+       {"Windows NT x86",       "W32X86",      3 },
        {"Windows NT R4000",     "W32MIPS",     2 },
        {"Windows NT Alpha_AXP", "W32ALPHA",    2 },
        {"Windows NT PowerPC",   "W32PPC",      2 },
+       {"Windows IA64",         "IA64",        3 },
+       {"Windows x64",          "x64",         3 },
        {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.
+ 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;
 
@@ -57,64 +76,53 @@ 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;
 }
 
+/****************************************************************************
+****************************************************************************/
 
-/**********************************************************************
- * dummy function  -- placeholder
-  */
-static NTSTATUS cmd_spoolss_not_implemented(struct cli_state *cli, 
-                                            TALLOC_CTX *mem_ctx,
-                                            int argc, char **argv)
-{
-       printf ("(*) This command is not currently implemented.\n");
-       return NT_STATUS_OK;
-}
-
-/***********************************************************************
- * Get printer information
- */
-static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli, 
+static WERROR cmd_spoolss_open_printer_ex(struct rpc_pipe_client *cli, 
                                             TALLOC_CTX *mem_ctx,
-                                            int argc, char **argv)
+                                            int argc, const char **argv)
 {
        WERROR          werror;
-       pstring         printername;
+       fstring         printername;
        fstring         servername, user;
        POLICY_HND      hnd;
        
        if (argc != 2) {
                printf("Usage: %s <printername>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
        
        if (!cli)
-               return NT_STATUS_UNSUCCESSFUL;
+            return WERR_GENERAL_FAILURE;
 
-       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       fstrcpy  (user, cli->user_name);
-       fstrcpy  (printername, argv[1]);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
+       fstrcpy(user, cli->user_name);
+       fstrcpy(printername, argv[1]);
 
        /* Open the printer handle */
 
-       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
-                                            "", MAXIMUM_ALLOWED_ACCESS, 
+       werror = rpccli_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);
+               werror = rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
                if (!W_ERROR_IS_OK(werror)) {
                        printf("Error closing printer handle! (%s)\n", 
@@ -122,13 +130,13 @@ static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli,
                }
        }
 
-       return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return werror;
 }
 
 
 /****************************************************************************
-printer info level 0 display function
 ****************************************************************************/
+
 static void display_print_info_0(PRINTER_INFO_0 *i0)
 {
        fstring name = "";
@@ -137,11 +145,9 @@ static void display_print_info_0(PRINTER_INFO_0 *i0)
        if (!i0)
                return;
 
-       if (i0->printername.buffer)
-               rpcstr_pull(name, i0->printername.buffer, sizeof(name), -1, STR_TERMINATE);
+       rpcstr_pull(name, i0->printername.buffer, sizeof(name), -1, STR_TERMINATE);
 
-       if (i0->servername.buffer)
-               rpcstr_pull(servername, i0->servername.buffer, sizeof(servername), -1,STR_TERMINATE);
+       rpcstr_pull(servername, i0->servername.buffer, sizeof(servername), -1,STR_TERMINATE);
   
        printf("\tprintername:[%s]\n", name);
        printf("\tservername:[%s]\n", servername);
@@ -187,25 +193,19 @@ static void display_print_info_0(PRINTER_INFO_0 *i0)
 }
 
 /****************************************************************************
-printer info level 1 display function
 ****************************************************************************/
+
 static void display_print_info_1(PRINTER_INFO_1 *i1)
 {
        fstring desc = "";
        fstring name = "";
        fstring comm = "";
 
-       if (i1->description.buffer)
-               rpcstr_pull(desc, i1->description.buffer, sizeof(desc), -1,
-                           STR_TERMINATE);
-
-       if (i1->name.buffer)
-               rpcstr_pull(name, i1->name.buffer, sizeof(name), -1, 
-                           STR_TERMINATE);
+       rpcstr_pull(desc, i1->description.buffer, sizeof(desc), -1,
+                   STR_TERMINATE);
 
-       if (i1->comment.buffer)
-               rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), -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);
@@ -216,8 +216,8 @@ static void display_print_info_1(PRINTER_INFO_1 *i1)
 }
 
 /****************************************************************************
-printer info level 2 display function
 ****************************************************************************/
+
 static void display_print_info_2(PRINTER_INFO_2 *i2)
 {
        fstring servername = "";
@@ -232,38 +232,17 @@ static void display_print_info_2(PRINTER_INFO_2 *i2)
        fstring datatype = "";
        fstring parameters = "";
        
-       if (i2->servername.buffer)
-               rpcstr_pull(servername, i2->servername.buffer,sizeof(servername), -1, STR_TERMINATE);
-
-       if (i2->printername.buffer)
-               rpcstr_pull(printername, i2->printername.buffer,sizeof(printername), -1, STR_TERMINATE);
-
-       if (i2->sharename.buffer)
-               rpcstr_pull(sharename, i2->sharename.buffer,sizeof(sharename), -1, STR_TERMINATE);
-
-       if (i2->portname.buffer)
-               rpcstr_pull(portname, i2->portname.buffer,sizeof(portname), -1, STR_TERMINATE);
-
-       if (i2->drivername.buffer)
-               rpcstr_pull(drivername, i2->drivername.buffer,sizeof(drivername), -1, STR_TERMINATE);
-
-       if (i2->comment.buffer)
-               rpcstr_pull(comment, i2->comment.buffer,sizeof(comment), -1, STR_TERMINATE);
-
-       if (i2->location.buffer)
-               rpcstr_pull(location, i2->location.buffer,sizeof(location), -1, STR_TERMINATE);
-
-       if (i2->sepfile.buffer)
-               rpcstr_pull(sepfile, i2->sepfile.buffer,sizeof(sepfile), -1, STR_TERMINATE);
-
-       if (i2->printprocessor.buffer) 
-               rpcstr_pull(printprocessor, i2->printprocessor.buffer,sizeof(printprocessor), -1, STR_TERMINATE);
-
-       if (i2->datatype.buffer)
-               rpcstr_pull(datatype, i2->datatype.buffer,sizeof(datatype), -1, STR_TERMINATE);
-
-       if (i2->parameters.buffer)
-               rpcstr_pull(parameters, i2->parameters.buffer,sizeof(parameters), -1, STR_TERMINATE);
+       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);
@@ -292,52 +271,61 @@ static void display_print_info_2(PRINTER_INFO_2 *i2)
 }
 
 /****************************************************************************
-printer info level 3 display function
 ****************************************************************************/
+
 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 void display_print_info_7(PRINTER_INFO_7 *i7)
+{
+       fstring guid = "";
+       rpcstr_pull(guid, i7->guid.buffer,sizeof(guid), -1, STR_TERMINATE);
+       printf("\tguid:[%s]\n", guid);
+       printf("\taction:[0x%x]\n", i7->action);
+}
+
 
-static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_enum_printers(struct rpc_pipe_client *cli, 
                                           TALLOC_CTX *mem_ctx,
-                                          int argc, char **argv)
+                                          int argc, const char **argv)
 {
        WERROR                  result;
        uint32                  info_level = 1;
        PRINTER_INFO_CTR        ctr;
-       uint32                  i = 0, num_printers, needed;
+       uint32                  i = 0, num_printers;
+       fstring name;
 
-       if (argc > 2
+       if (argc > 3
        {
-               printf("Usage: %s [level]\n", argv[0]);
-               return NT_STATUS_OK;
+               printf("Usage: %s [level] [name]\n", argv[0]);
+               return WERR_OK;
        }
 
-       if (argc == 2) {
+       if (argc >= 2)
                info_level = atoi(argv[1]);
-       }
 
-       /* Enumerate printers  -- Should we enumerate types other 
-          than PRINTER_ENUM_LOCAL?  Maybe accept as a parameter?  --jerry */
+       if (argc == 3)
+               fstrcpy(name, argv[2]);
+       else {
+               slprintf(name, sizeof(name)-1, "\\\\%s", cli->cli->desthost);
+               strupper_m(name);
+       }
 
        ZERO_STRUCT(ctr);
 
-       result = cli_spoolss_enum_printers(
-               cli, mem_ctx, 0, &needed, PRINTER_ENUM_LOCAL, 
+       result = rpccli_spoolss_enum_printers(cli, mem_ctx, 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, PRINTER_ENUM_LOCAL, 
-                       info_level, &num_printers, &ctr);
-
        if (W_ERROR_IS_OK(result)) {
 
                if (!num_printers) {
@@ -367,12 +355,12 @@ static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli,
        }
        done:
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
 /****************************************************************************
-port info level 1 display function
 ****************************************************************************/
+
 static void display_port_info_1(PORT_INFO_1 *i1)
 {
        fstring buffer;
@@ -382,8 +370,8 @@ static void display_port_info_1(PORT_INFO_1 *i1)
 }
 
 /****************************************************************************
-port info level 2 display function
 ****************************************************************************/
+
 static void display_port_info_2(PORT_INFO_2 *i2)
 {
        fstring buffer;
@@ -396,25 +384,50 @@ static void display_port_info_2(PORT_INFO_2 *i2)
        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("\tPort Type:\t" );
+       if ( i2->port_type ) {
+               int comma = 0; /* hack */
+               printf( "[" );
+               if ( i2->port_type & PORT_TYPE_READ ) {
+                       printf( "Read" );
+                       comma = 1;
+               }
+               if ( i2->port_type & PORT_TYPE_WRITE ) {
+                       printf( "%sWrite", comma ? ", " : "" );
+                       comma = 1;
+               }
+               /* These two have slightly different interpretations
+                on 95/98/ME but I'm disregarding that for now */
+               if ( i2->port_type & PORT_TYPE_REDIRECTED ) {
+                       printf( "%sRedirected", comma ? ", " : "" );
+                       comma = 1;
+               }
+               if ( i2->port_type & PORT_TYPE_NET_ATTACHED ) {
+                       printf( "%sNet-Attached", comma ? ", " : "" );
+               }
+               printf( "]\n" );
+       } else {
+               printf( "[Unset]\n" );
+       }
        printf("\tReserved:\t[%d]\n", i2->reserved);
        printf("\n");
 }
 
-/* Enumerate ports */
+/****************************************************************************
+****************************************************************************/
 
-static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_ports(struct rpc_pipe_client *cli, 
                                       TALLOC_CTX *mem_ctx, int argc, 
-                                      char **argv)
+                                      const char **argv)
 {
        WERROR                  result;
-       uint32                  needed, info_level = 1;
+       uint32                  info_level = 1;
        PORT_INFO_CTR           ctr;
-       int                     returned;
+       uint32                  returned;
        
        if (argc > 2) {
                printf("Usage: %s [level]\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
        
        if (argc == 2)
@@ -424,12 +437,7 @@ static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli,
 
        ZERO_STRUCT(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);
+       result = rpccli_spoolss_enum_ports(cli, mem_ctx, info_level, &returned, &ctr);
 
        if (W_ERROR_IS_OK(result)) {
                int i;
@@ -449,19 +457,18 @@ static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli,
                }
        }
        
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
-/***********************************************************************
- * Set printer comment - use a level2 set.
- */
-static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_setprinter(struct rpc_pipe_client *cli,
                                        TALLOC_CTX *mem_ctx,
-                                       int argc, char **argv)
+                                       int argc, const char **argv)
 {
        POLICY_HND      pol;
        WERROR          result;
-       uint32          needed;
        uint32          info_level = 2;
        BOOL            opened_hnd = False;
        PRINTER_INFO_CTR ctr;
@@ -473,7 +480,7 @@ static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
        if (argc == 1 || argc > 3) {
                printf("Usage: %s printername comment\n", argv[0]);
 
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
        /* Open a printer handle */
@@ -481,14 +488,14 @@ static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
                fstrcpy(comment, argv[2]);
        }
 
-       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       fstrcpy (printername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(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,
+       result = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                               PRINTER_ALL_ACCESS, servername,
                                user, &pol);
                                
        if (!W_ERROR_IS_OK(result))
@@ -497,10 +504,7 @@ static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
        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);
+        result = rpccli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr);
 
         if (!W_ERROR_IS_OK(result))
                 goto done;
@@ -511,23 +515,88 @@ static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
        ctr.printers_2->devmode = NULL;
        ctr.printers_2->secdesc = NULL;
 
-       result = cli_spoolss_setprinter(cli, mem_ctx, &pol, info_level, &ctr, 0);
+       result = rpccli_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);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
-/***********************************************************************
- * Get printer information
- */
-static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_setprintername(struct rpc_pipe_client *cli,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc, const char **argv)
+{
+       POLICY_HND      pol;
+       WERROR          result;
+       uint32          info_level = 2;
+       BOOL            opened_hnd = False;
+       PRINTER_INFO_CTR ctr;
+       fstring         printername,
+                       servername,
+                       user,
+                       new_printername;
+
+       if (argc == 1 || argc > 3) {
+               printf("Usage: %s printername new_printername\n", argv[0]);
+
+               return WERR_OK;
+       }
+
+       /* Open a printer handle */
+       if (argc == 3) {
+               fstrcpy(new_printername, argv[2]);
+       }
+
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
+       slprintf(printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy(user, cli->user_name);
+
+       /* get a printer handle */
+       result = rpccli_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 */
+        result = rpccli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr);
+
+        if (!W_ERROR_IS_OK(result))
+                goto done;
+
+       /* Modify the printername. */
+       init_unistr(&ctr.printers_2->printername, new_printername);
+       ctr.printers_2->devmode = NULL;
+       ctr.printers_2->secdesc = NULL;
+
+       result = rpccli_spoolss_setprinter(cli, mem_ctx, &pol, info_level, &ctr, 0);
+       if (W_ERROR_IS_OK(result))
+               printf("Success in setting printername.\n");
+
+ done:
+       if (opened_hnd)
+               rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli,
                                        TALLOC_CTX *mem_ctx,
-                                       int argc, char **argv)
+                                       int argc, const char **argv)
 {
        POLICY_HND      pol;
        WERROR          result;
@@ -537,11 +606,10 @@ static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
        fstring         printername,
                        servername,
                        user;
-       uint32 needed;
 
        if (argc == 1 || argc > 3) {
                printf("Usage: %s <printername> [level]\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
        /* Open a printer handle */
@@ -549,14 +617,14 @@ static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
                info_level = atoi(argv[2]);
        }
 
-       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       slprintf (printername, sizeof(fstring)-1, "%s\\%s", servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(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, 
+       result = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
                                             "", MAXIMUM_ALLOWED_ACCESS, 
                                             servername, user, &pol);
 
@@ -567,12 +635,7 @@ static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
 
        /* 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);
+       result = rpccli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr);
 
        if (!W_ERROR_IS_OK(result))
                goto done;
@@ -592,6 +655,9 @@ static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
        case 3:
                display_print_info_3(ctr.printers_3);
                break;
+       case 7:
+               display_print_info_7(ctr.printers_7);
+               break;
        default:
                printf("unknown info level %d\n", info_level);
                break;
@@ -599,14 +665,205 @@ static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
 
  done: 
        if (opened_hnd) 
-               cli_spoolss_close_printer(cli, mem_ctx, &pol);
+               rpccli_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: {
+               char *hex = hex_encode(NULL, value.data_p, value.size);
+               size_t i, len;
+               printf("%s: REG_BINARY:", value.valuename);
+               len = strlen(hex);
+               for (i=0; i<len; i++) {
+                       if (hex[i] == '\0') {
+                               break;
+                       }
+                       if (i%40 == 0) {
+                               putchar('\n');
+                       }
+                       putchar(hex[i]);
+               }
+               TALLOC_FREE(hex);
+               putchar('\n');
+               break;
+       }
+       case REG_MULTI_SZ: {
+               uint32 i, num_values;
+               char **values;
+
+               if (!W_ERROR_IS_OK(reg_pull_multi_sz(NULL, value.data_p,
+                                                    value.size, &num_values,
+                                                    &values))) {
+                       d_printf("reg_pull_multi_sz failed\n");
+                       break;
+               }
+
+               for (i=0; i<num_values; i++) {
+                       d_printf("%s\n", values[i]);
+               }
+               TALLOC_FREE(values);
+               break;
+       }
+       default:
+               printf("%s: unknown type %d\n", value.valuename, value.type);
+       }
+       
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_getprinterdata(struct rpc_pipe_client *cli,
+                                          TALLOC_CTX *mem_ctx,
+                                          int argc, const char **argv)
+{
+       POLICY_HND      pol;
+       WERROR          result;
+       BOOL            opened_hnd = False;
+       fstring         printername,
+                       servername,
+                       user;
+       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->cli->desthost);
+       strupper_m(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 = rpccli_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 = rpccli_spoolss_getprinterdata(cli, mem_ctx, &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) 
+               rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
+
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli,
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc, const char **argv)
+{
+       POLICY_HND      pol;
+       WERROR          result;
+       BOOL            opened_hnd = False;
+       fstring         printername,
+                       servername,
+                       user;
+       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->cli->desthost);
+       strupper_m(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 = rpccli_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 = rpccli_spoolss_getprinterdataex(cli, mem_ctx, &pol, keyname, 
+               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) 
+               rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
 /****************************************************************************
-printer info level 0 display function
 ****************************************************************************/
+
 static void display_print_driver_1(DRIVER_INFO_1 *i1)
 {
        fstring name;
@@ -622,8 +879,8 @@ static void display_print_driver_1(DRIVER_INFO_1 *i1)
 }
 
 /****************************************************************************
-printer info level 1 display function
 ****************************************************************************/
+
 static void display_print_driver_2(DRIVER_INFO_2 *i1)
 {
        fstring name;
@@ -652,19 +909,19 @@ static void display_print_driver_2(DRIVER_INFO_2 *i1)
 }
 
 /****************************************************************************
-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;
@@ -714,16 +971,15 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1)
        return; 
 }
 
-/***********************************************************************
- * Get printer information
- */
-static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_getdriver(struct rpc_pipe_client *cli, 
                                       TALLOC_CTX *mem_ctx,
-                                      int argc, char **argv)
+                                      int argc, const char **argv)
 {
        POLICY_HND      pol;
        WERROR          werror;
-       NTSTATUS        result;
        uint32          info_level = 3;
        BOOL            opened_hnd = False;
        PRINTER_DRIVER_CTR      ctr;
@@ -731,32 +987,31 @@ static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
                        servername, 
                        user;
        uint32          i;
+       BOOL            success = False;
 
        if ((argc == 1) || (argc > 3)) 
        {
                printf("Usage: %s <printername> [level]\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
        /* get the arguments need to open the printer handle */
-       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       fstrcpy  (user, cli->user_name);
-       fstrcpy  (printername, argv[1]);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
        if (argc == 3)
                info_level = atoi(argv[2]);
 
        /* Open a printer handle */
 
-       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+       werror = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
                                             PRINTER_ACCESS_USE,
                                             servername, user, &pol);
 
-       result = W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-
-       if (!NT_STATUS_IS_OK(result)) {
+       if (!W_ERROR_IS_OK(werror)) {
                printf("Error opening printer handle for %s!\n", printername);
-               return result;
+               return werror;
        }
 
        opened_hnd = True;
@@ -764,19 +1019,17 @@ static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
        /* loop through and print driver info level for each architecture */
 
        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);
+               werror = rpccli_spoolss_getprinterdriver( cli, mem_ctx, &pol, info_level, 
+                       archi_table[i].long_archi, archi_table[i].version,
+                       &ctr);
 
                if (!W_ERROR_IS_OK(werror))
                        continue;
+               
+               /* need at least one success */
+               
+               success = True;
                        
                printf ("\n[%s]\n", archi_table[i].long_archi);
 
@@ -799,28 +1052,30 @@ static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
        /* Cleanup */
 
        if (opened_hnd)
-               cli_spoolss_close_printer (cli, mem_ctx, &pol);
+               rpccli_spoolss_close_printer (cli, mem_ctx, &pol);
        
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       if ( success )
+               werror = WERR_OK;
+               
+       return werror;
 }
 
-/***********************************************************************
- * Get printer information
- */
-static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_enum_drivers(struct rpc_pipe_client *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
-       WERROR werror;
+       WERROR werror = WERR_OK;
        uint32          info_level = 1;
        PRINTER_DRIVER_CTR      ctr;
        uint32          i, j,
                        returned;
 
-       if (argc > 2) 
-       {
+       if (argc > 2) {
                printf("Usage: enumdrivers [level]\n");
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
        if (argc == 2)
@@ -828,18 +1083,22 @@ static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli,
 
 
        /* loop through and print driver info level for each architecture */
-       for (i=0; archi_table[i].long_archi!=NULL; i++) 
-       {
-               uint32 needed;
+       for (i=0; archi_table[i].long_archi!=NULL; i++) {
+               /* check to see if we already asked for this architecture string */
+
+               if ( i>0 && strequal(archi_table[i].long_archi, archi_table[i-1].long_archi) )
+                       continue;
 
-               werror = cli_spoolss_enumprinterdrivers(
-                       cli, mem_ctx, 0, &needed, info_level, 
+               werror = rpccli_spoolss_enumprinterdrivers(
+                       cli, mem_ctx, 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 (W_ERROR_V(werror) == W_ERROR_V(WERR_INVALID_ENVIRONMENT)) {
+                       printf ("Server does not support environment [%s]\n", 
+                               archi_table[i].long_archi);
+                       werror = WERR_OK;
+                       continue;
+               }
 
                if (returned == 0)
                        continue;
@@ -856,31 +1115,31 @@ static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli,
                        
                case 1:
                        for (j=0; j < returned; j++) {
-                               display_print_driver_1 (&(ctr.info1[j]));
+                               display_print_driver_1 (&ctr.info1[j]);
                        }
                        break;
                case 2:
                        for (j=0; j < returned; j++) {
-                               display_print_driver_2 (&(ctr.info2[j]));
+                               display_print_driver_2 (&ctr.info2[j]);
                        }
                        break;
                case 3:
                        for (j=0; j < returned; j++) {
-                               display_print_driver_3 (&(ctr.info3[j]));
+                               display_print_driver_3 (&ctr.info3[j]);
                        }
                        break;
                default:
                        printf("unknown info level %d\n", info_level);
-                       break;
+                       return WERR_UNKNOWN_LEVEL;
                }
        }
        
-       return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return werror;
 }
 
 /****************************************************************************
-printer info level 1 display function
 ****************************************************************************/
+
 static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1)
 {
         fstring name;
@@ -892,21 +1151,20 @@ static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1)
        printf ("\tDirectory Name:[%s]\n", name);
 }
 
-/***********************************************************************
- * Get printer driver directory information
- */
-static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_getdriverdir(struct rpc_pipe_client *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
        WERROR result;
        fstring                 env;
        DRIVER_DIRECTORY_CTR    ctr;
-       uint32 needed;
 
        if (argc > 2) {
                printf("Usage: %s [environment]\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
        /* Get the arguments need to open the printer handle */
@@ -918,22 +1176,17 @@ static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli,
 
        /* Get the directory.  Only use Info level 1 */
 
-       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);
+       result = rpccli_spoolss_getprinterdriverdir(cli, mem_ctx, 1, env, &ctr);
 
        if (W_ERROR_IS_OK(result))
                display_printdriverdir_1(ctr.info1);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
-/*******************************************************************************
- set the version and environment fields of a DRIVER_INFO_3 struct
- ******************************************************************************/
+/****************************************************************************
+****************************************************************************/
+
 void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch)
 {
 
@@ -962,7 +1215,8 @@ 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 (char* str, const char* delim, UNISTR* dest)
 {
        char    *ptr;
 
@@ -973,7 +1227,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)
@@ -989,11 +1243,8 @@ 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 (
-       TALLOC_CTX *mem_ctx, 
-       DRIVER_INFO_3 *info, 
-       char *args
-)
+static BOOL init_drv_info_3_members ( TALLOC_CTX *mem_ctx, DRIVER_INFO_3 *info, 
+                                      char *args )
 {
        char    *str, *str2;
        uint32  len, i;
@@ -1024,14 +1275,14 @@ static BOOL init_drv_info_3_members (
        /* 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*)talloc(mem_ctx, (len+1)*sizeof(uint16))) == NULL)
+       if ((info->dependentfiles=TALLOC_ARRAY(mem_ctx, uint16, len+1)) == 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] = SSVAL(&info->dependentfiles[i], 0, str2[i]);
+               SSVAL(&info->dependentfiles[i], 0, str2[i]);
        }
        info->dependentfiles[len] = '\0';
 
@@ -1039,47 +1290,61 @@ static BOOL init_drv_info_3_members (
 }
 
 
-static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_addprinterdriver(struct rpc_pipe_client *cli, 
                                              TALLOC_CTX *mem_ctx,
-                                             int argc, char **argv)
+                                             int argc, const char **argv)
 {
        WERROR result;
        uint32                  level = 3;
        PRINTER_DRIVER_CTR      ctr;
        DRIVER_INFO_3           info3;
-       fstring                 arch;
+       const char              *arch;
        fstring                 driver_name;
+       char                    *driver_args;
 
        /* parse the command arguements */
-       if (argc != 3)
+       if (argc != 3 && argc != 4)
        {
-               printf ("Usage: %s <Environment>\\\n", argv[0]);
+               printf ("Usage: %s <Environment> \\\n", argv[0]);
                printf ("\t<Long Printer Name>:<Driver File Name>:<Data File Name>:\\\n");
                printf ("\t<Config File Name>:<Help File Name>:<Language Monitor Name>:\\\n");
-               printf ("\t<Default Data Type>:<Comma Separated list of Files>\n");
+               printf ("\t<Default Data Type>:<Comma Separated list of Files> \\\n");
+               printf ("\t[version]\n");
 
-               return NT_STATUS_OK;
+            return WERR_OK;
         }
                
        /* 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(mem_ctx, &info3, argv[2]))
+       driver_args = talloc_strdup( mem_ctx, argv[2] );
+       if (!init_drv_info_3_members(mem_ctx, &info3, driver_args ))
        {
                printf ("Error Invalid parameter list - %s.\n", argv[2]);
-               return NT_STATUS_INVALID_PARAMETER;
+               return WERR_INVALID_PARAM;
+       }
+
+       /* if printer driver version specified, override the default version
+        * used by the architecture.  This allows installation of Windows
+        * 2000 (version 3) printer drivers. */
+       if (argc == 4)
+       {
+               info3.version = atoi(argv[3]);
        }
 
 
        ctr.info3 = &info3;
-       result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr);
+       result = rpccli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr);
 
        if (W_ERROR_IS_OK(result)) {
                rpcstr_pull(driver_name, info3.name.buffer, 
@@ -1088,13 +1353,16 @@ static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli,
                        driver_name);
        }
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
 
-static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_addprinterex(struct rpc_pipe_client *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
        WERROR result;
        uint32                  level = 2;
@@ -1106,17 +1374,15 @@ static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli,
        if (argc != 5)
        {
                printf ("Usage: %s <name> <shared name> <driver> <port>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
         }
        
-        slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (servername);
+        slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+        strupper_m(servername);
 
-       /* Fill in the DRIVER_INFO_3 struct */
+       /* Fill in the DRIVER_INFO_2 struct */
        ZERO_STRUCT(info2);
-#if 0  /* JERRY */
-       init_unistr( &info2.servername,         servername);
-#endif
+       
        init_unistr( &info2.printername,        argv[1]);
        init_unistr( &info2.sharename,          argv[2]);
        init_unistr( &info2.drivername,         argv[3]);
@@ -1141,17 +1407,20 @@ static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli,
        */
 
        ctr.printers_2 = &info2;
-       result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr);
+       result = rpccli_spoolss_addprinterex (cli, mem_ctx, level, &ctr);
 
        if (W_ERROR_IS_OK(result))
                printf ("Printer %s successfully installed.\n", argv[1]);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
-static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli, 
                                       TALLOC_CTX *mem_ctx,
-                                      int argc, char **argv)
+                                      int argc, const char **argv)
 {
        POLICY_HND              pol;
        WERROR                  result;
@@ -1162,24 +1431,23 @@ static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli,
        fstring                 servername,
                                printername,
                                user;
-       uint32 needed;
        
        /* parse the command arguements */
        if (argc != 3)
        {
                printf ("Usage: %s <printer> <driver>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
         }
 
-       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       slprintf (printername, sizeof(fstring)-1, "%s\\%s", servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(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, "", 
-                                            MAXIMUM_ALLOWED_ACCESS,
+       result = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                                            PRINTER_ALL_ACCESS,
                                             servername, user, &pol);
 
        if (!W_ERROR_IS_OK(result))
@@ -1192,12 +1460,7 @@ static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli,
        ZERO_STRUCT (info2);
        ctr.printers_2 = &info2;
 
-       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);
+       result = rpccli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr);
 
        if (!W_ERROR_IS_OK(result)) {
                printf ("Unable to retrieve printer information!\n");
@@ -1208,7 +1471,7 @@ static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli,
 
        init_unistr(&ctr.printers_2->drivername, argv[2]);
 
-       result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0);
+       result = rpccli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0);
 
        if (!W_ERROR_IS_OK(result)) {
                printf("SetPrinter call failed!\n");
@@ -1221,81 +1484,140 @@ done:
        /* Cleanup */
 
        if (opened_hnd)
-               cli_spoolss_close_printer(cli, mem_ctx, &pol);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
 
-static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_deletedriverex(struct rpc_pipe_client *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
-       WERROR result;
+       WERROR result, ret = WERR_UNKNOWN_PRINTER_DRIVER;
+       int   i;
+       int vers = -1;
+       const char *arch = NULL;
+       /* parse the command arguements */
+       if (argc < 2 || argc > 4) {
+               printf ("Usage: %s <driver> [arch] [version]\n", argv[0]);
+               return WERR_OK;
+       }
+
+       if (argc >= 3)
+               arch = argv[2];
+       if (argc == 4)
+               vers = atoi (argv[3]);
+       /* delete the driver for all architectures */
+       for (i=0; archi_table[i].long_archi; i++) {
+
+               if (arch &&  !strequal( archi_table[i].long_archi, arch)) 
+                       continue;
+
+               if (vers >= 0 && archi_table[i].version != vers)
+                       continue;
+
+               /* make the call to remove the driver */
+               result = rpccli_spoolss_deleteprinterdriverex(
+                       cli, mem_ctx, archi_table[i].long_archi, argv[1], archi_table[i].version); 
+
+               if ( !W_ERROR_IS_OK(result) ) 
+               {
+                       if ( !W_ERROR_EQUAL(result, WERR_UNKNOWN_PRINTER_DRIVER) ) {
+                               printf ("Failed to remove driver %s for arch [%s] (version: %d): %s\n", 
+                                       argv[1], archi_table[i].long_archi, archi_table[i].version, dos_errstr(result));
+                       }
+               } 
+               else 
+               {
+                       printf ("Driver %s and files removed for arch [%s] (version: %d).\n", argv[1], 
+                       archi_table[i].long_archi, archi_table[i].version);
+                       ret = WERR_OK;
+               }
+       }
+  
+       return ret;
+}
+
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_deletedriver(struct rpc_pipe_client *cli, 
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, const char **argv)
+{
+       WERROR result = WERR_OK;
        fstring                 servername;
        int                     i;
        
        /* parse the command arguements */
-       if (argc != 2)
-       {
+       if (argc != 2) {
                printf ("Usage: %s <driver>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
         }
 
-       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
 
        /* delete the driver for all architectures */
-       for (i=0; archi_table[i].long_archi; i++)
-       {
+       for (i=0; archi_table[i].long_archi; i++) {
                /* make the call to remove the driver */
-               result = cli_spoolss_deleteprinterdriver(
+               result = rpccli_spoolss_deleteprinterdriver(
                        cli, mem_ctx, archi_table[i].long_archi, argv[1]);
 
-               if (!W_ERROR_IS_OK(result)) {
-                       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
+               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 W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
-static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_getprintprocdir(struct rpc_pipe_client *cli, 
                                            TALLOC_CTX *mem_ctx,
-                                           int argc, char **argv)
+                                           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 NT_STATUS_OK;
+               return WERR_OK;
         }
 
-       if (asprintf(&servername, "\\\\%s", cli->desthost) < 0)
-               return NT_STATUS_NO_MEMORY;
-       strupper(servername);
+       if (asprintf(&servername, "\\\\%s", cli->cli->desthost) < 0)
+               return WERR_NOMEM;
+       strupper_m(servername);
 
        if (asprintf(&environment, "%s", (argc == 2) ? argv[1] : 
                     PRINTER_DRIVER_ARCHITECTURE) < 0) {
                SAFE_FREE(servername);
-               return NT_STATUS_NO_MEMORY;
+               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);
+       result = rpccli_spoolss_getprintprocessordirectory(
+               cli, mem_ctx, servername, environment, procdir);
 
        if (W_ERROR_IS_OK(result))
                printf("%s\n", procdir);
@@ -1303,13 +1625,14 @@ static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli,
        SAFE_FREE(servername);
        SAFE_FREE(environment);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
-/* Add a form */
+/****************************************************************************
+****************************************************************************/
 
-static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                   int argc, char **argv)
+static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                   int argc, const char **argv)
 {
        POLICY_HND handle;
        WERROR werror;
@@ -1321,17 +1644,17 @@ static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        if (argc != 3) {
                printf ("Usage: %s <printer> <formname>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
         }
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       asprintf(&servername, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
-       werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
-                                            MAXIMUM_ALLOWED_ACCESS, 
+       werror = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
+                                            PRINTER_ALL_ACCESS, 
                                             servername, cli->user_name, &handle);
 
        if (!W_ERROR_IS_OK(werror))
@@ -1348,27 +1671,28 @@ static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        form.right = 20;
        form.bottom = 30;
 
-       init_unistr2(&form.name, argv[2], strlen(argv[2]) + 1);
+       init_unistr2(&form.name, argv[2], UNI_STR_TERMINATE);
 
        /* Add the form */
 
 
-       werror = cli_spoolss_addform(cli, mem_ctx, &handle, 1, &form);
+       werror = rpccli_spoolss_addform(cli, mem_ctx, &handle, 1, &form);
 
  done:
        if (got_handle)
-               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &handle);
 
        SAFE_FREE(servername);
        SAFE_FREE(printername);
 
-       return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return werror;
 }
 
-/* Set a form */
+/****************************************************************************
+****************************************************************************/
 
-static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                   int argc, char **argv)
+static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                   int argc, const char **argv)
 {
        POLICY_HND handle;
        WERROR werror;
@@ -1380,16 +1704,16 @@ static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        if (argc != 3) {
                printf ("Usage: %s <printer> <formname>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
         }
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       asprintf(&servername, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
-       werror = cli_spoolss_open_printer_ex(
+       werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
                servername, cli->user_name, &handle);
 
@@ -1407,48 +1731,86 @@ static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        form.right = 2000;
        form.bottom = 3000;
 
-       init_unistr2(&form.name, argv[2], strlen(argv[2]) + 1);
+       init_unistr2(&form.name, argv[2], UNI_STR_TERMINATE);
 
        /* Set the form */
 
-       werror = cli_spoolss_setform(cli, mem_ctx, &handle, 1, argv[2], &form);
+       werror = rpccli_spoolss_setform(cli, mem_ctx, &handle, 1, argv[2], &form);
 
  done:
        if (got_handle)
-               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &handle);
 
        SAFE_FREE(servername);
        SAFE_FREE(printername);
 
-       return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return werror;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static const char *get_form_flag(int form_flag)
+{
+       switch (form_flag) {
+       case FORM_USER:
+               return "FORM_USER";
+       case FORM_BUILTIN:
+               return "FORM_BUILTIN";
+       case FORM_PRINTER:
+               return "FORM_PRINTER";
+       default:
+               return "unknown";
+       }
 }
 
-/* Get a form */
+/****************************************************************************
+****************************************************************************/
 
-static NTSTATUS cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                   int argc, char **argv)
+static void display_form(FORM_1 *form)
+{
+       fstring form_name = "";
+
+       if (form->name.buffer)
+               rpcstr_pull(form_name, form->name.buffer,
+                           sizeof(form_name), -1, STR_TERMINATE);
+
+       printf("%s\n" \
+               "\tflag: %s (%d)\n" \
+               "\twidth: %d, length: %d\n" \
+               "\tleft: %d, right: %d, top: %d, bottom: %d\n\n", 
+               form_name, get_form_flag(form->flag), form->flag,
+               form->width, form->length, 
+               form->left, form->right, 
+               form->top, form->bottom);
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_getform(struct rpc_pipe_client *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 NT_STATUS_OK;
+               return WERR_OK;
         }
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       asprintf(&servername, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
-       werror = cli_spoolss_open_printer_ex(
+       werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
                servername, cli->user_name, &handle);
 
@@ -1457,40 +1819,31 @@ static NTSTATUS cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        got_handle = True;
 
-       /* Set the form */
-
-       werror = cli_spoolss_getform(cli, mem_ctx, 0, &needed,
-                                    &handle, argv[2], 1, &form);
+       /* Get the form */
 
-       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
-               werror = cli_spoolss_getform(cli, mem_ctx, needed, NULL,
-                                            &handle, argv[2], 1, &form);
+       werror = rpccli_spoolss_getform(cli, mem_ctx, &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);
+       display_form(&form);
 
  done:
        if (got_handle)
-               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &handle);
 
        SAFE_FREE(servername);
        SAFE_FREE(printername);
 
-       return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return werror;
 }
 
-/* Delete a form */
+/****************************************************************************
+****************************************************************************/
 
-static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli, 
+static WERROR cmd_spoolss_deleteform(struct rpc_pipe_client *cli, 
                                       TALLOC_CTX *mem_ctx, int argc, 
-                                      char **argv)
+                                      const char **argv)
 {
        POLICY_HND handle;
        WERROR werror;
@@ -1501,16 +1854,16 @@ static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli,
 
        if (argc != 3) {
                printf ("Usage: %s <printer> <formname>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
         }
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       asprintf(&servername, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
-       werror = cli_spoolss_open_printer_ex(
+       werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
                servername, cli->user_name, &handle);
 
@@ -1521,45 +1874,46 @@ static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli,
 
        /* Delete the form */
 
-       werror = cli_spoolss_deleteform(cli, mem_ctx, &handle, argv[2]);
+       werror = rpccli_spoolss_deleteform(cli, mem_ctx, &handle, argv[2]);
 
  done:
        if (got_handle)
-               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &handle);
 
        SAFE_FREE(servername);
        SAFE_FREE(printername);
 
-       return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return werror;
 }
 
-/* Enumerate forms */
+/****************************************************************************
+****************************************************************************/
 
-static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_forms(struct rpc_pipe_client *cli, 
                                       TALLOC_CTX *mem_ctx, int argc, 
-                                      char **argv)
+                                      const char **argv)
 {
        POLICY_HND handle;
        WERROR werror;
        char *servername = NULL, *printername = NULL;
        BOOL got_handle = False;
-       uint32 needed, num_forms, level = 1, i;
+       uint32 num_forms, level = 1, i;
        FORM_1 *forms;
        
        /* Parse the command arguements */
 
        if (argc != 2) {
                printf ("Usage: %s <printer>\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
         }
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       asprintf(&servername, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
-       werror = cli_spoolss_open_printer_ex(
+       werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
                servername, cli->user_name, &handle);
 
@@ -1570,13 +1924,7 @@ static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli,
 
        /* 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);
+       werror = rpccli_spoolss_enumforms(cli, mem_ctx, &handle, level, &num_forms, &forms);
 
        if (!W_ERROR_IS_OK(werror))
                goto done;
@@ -1584,50 +1932,74 @@ static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli,
        /* 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);
+               display_form(&forms[i]);
 
-               printf("%s\n", form_name);
        }
 
  done:
        if (got_handle)
-               cli_spoolss_close_printer(cli, mem_ctx, &handle);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &handle);
 
        SAFE_FREE(servername);
        SAFE_FREE(printername);
 
-       return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return werror;
 }
 
-static NTSTATUS cmd_spoolss_setprinterdata(struct cli_state *cli,
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx,
-                                           int argc, char **argv)
+                                           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 = NULL;
+       PRINTER_INFO_0 info;
+       REGISTRY_VALUE value;
 
        /* parse the command arguements */
-       if (argc != 4) {
-               printf ("Usage: %s <printer> <value> <data>\n", argv[0]);
-               return NT_STATUS_OK;
-        }
+       if (argc < 5) {
+               printf ("Usage: %s <printer> <string|binary|dword|multistring>"
+                       " <value> <data>\n",
+                       argv[0]);
+               return WERR_INVALID_PARAM;
+       }
 
-       slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       slprintf (printername, sizeof(fstring)-1, "%s\\%s", servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
+       slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy(user, cli->user_name);
+
+       value.type = REG_NONE;
+
+       if (strequal(argv[2], "string")) {
+               value.type = REG_SZ;
+       }
+
+       if (strequal(argv[2], "binary")) {
+               value.type = REG_BINARY;
+       }
+
+       if (strequal(argv[2], "dword")) {
+               value.type = REG_DWORD;
+       }
+
+       if (strequal(argv[2], "multistring")) {
+               value.type = REG_MULTI_SZ;
+       }
+
+       if (value.type == REG_NONE) {
+               printf("Unknown data type: %s\n", argv[2]);
+               return WERR_INVALID_PARAM;
+       }
 
        /* get a printer handle */
-       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
+       result = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
                                             MAXIMUM_ALLOWED_ACCESS, servername, 
                                             user, &pol);
        if (!W_ERROR_IS_OK(result))
@@ -1635,99 +2007,161 @@ static NTSTATUS cmd_spoolss_setprinterdata(struct cli_state *cli,
 
        opened_hnd = True;
 
-        result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed,
-                                        &pol, 0, &ctr);
+       ctr.printers_0 = &info;
 
-        if (W_ERROR_V(result) == ERRinsufficientbuffer)
-                result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, 0, &ctr);
+        result = rpccli_spoolss_getprinter(cli, mem_ctx, &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);
+       printf("%s\n", current_timestring(True));
+       printf("\tchange_id (before set)\t:[0x%x]\n", info.change_id);
 
        /* Set the printer data */
        
-       result = cli_spoolss_setprinterdata(
-               cli, mem_ctx, &pol, argv[2], REG_SZ, argv[3], 
-               strlen(argv[3]) + 1);
+       fstrcpy(value.valuename, argv[3]);
+
+       switch (value.type) {
+       case REG_SZ: {
+               UNISTR2 data;
+               init_unistr2(&data, argv[4], UNI_STR_TERMINATE);
+               value.size = data.uni_str_len * 2;
+               if (value.size) {
+                       value.data_p = (uint8 *)TALLOC_MEMDUP(mem_ctx, data.buffer,
+                                                     value.size);
+               } else {
+                       value.data_p = NULL;
+               }
+               break;
+       }
+       case REG_DWORD: {
+               uint32 data = strtoul(argv[4], NULL, 10);
+               value.size = sizeof(data);
+               if (sizeof(data)) {
+                       value.data_p = (uint8 *)TALLOC_MEMDUP(mem_ctx, &data,
+                                                     sizeof(data));
+               } else {
+                       value.data_p = NULL;
+               }
+               break;
+       }
+       case REG_BINARY: {
+               DATA_BLOB data = strhex_to_data_blob(mem_ctx, argv[4]);
+               value.data_p = data.data;
+               value.size = data.length;
+               break;
+       }
+       case REG_MULTI_SZ: {
+               int i;
+               size_t len = 0;
+               char *p;
+
+               for (i=4; i<argc; i++) {
+                       if (strcmp(argv[i], "NULL") == 0) {
+                               argv[i] = "";
+                       }
+                       len += strlen(argv[i])+1;
+               }
+
+               value.size = len*2;
+               value.data_p = TALLOC_ARRAY(mem_ctx, unsigned char, value.size);
+               if (value.data_p == NULL) {
+                       result = WERR_NOMEM;
+                       goto done;
+               }
+
+               p = (char *)value.data_p;
+               len = value.size;
+               for (i=4; i<argc; i++) {
+                       size_t l = (strlen(argv[i])+1)*2;
+                       rpcstr_push(p, argv[i], len, STR_TERMINATE);
+                       p += l;
+                       len -= l;
+               }
+               SMB_ASSERT(len == 0);
+               break;
+       }
+       default:
+               printf("Unknown data type: %s\n", argv[2]);
+               result = WERR_INVALID_PARAM;
+               goto done;
+       }
+
+       result = rpccli_spoolss_setprinterdata(cli, mem_ctx, &pol, &value);
                
        if (!W_ERROR_IS_OK(result)) {
-               printf ("Unable to set [%s=%s]!\n", argv[2], argv[3]);
+               printf ("Unable to set [%s=%s]!\n", argv[3], argv[4]);
                goto done;
        }
-       printf("\tSetPrinterData succeeded [%s: %s]\n", argv[2], argv[3]);
-
-        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);
+       printf("\tSetPrinterData succeeded [%s: %s]\n", argv[3], argv[4]);
+       
+        result = rpccli_spoolss_getprinter(cli, mem_ctx, &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);
+       printf("%s\n", current_timestring(True));
+       printf("\tchange_id (after set)\t:[0x%x]\n", info.change_id);
 
 done:
        /* cleanup */
        if (opened_hnd)
-               cli_spoolss_close_printer(cli, mem_ctx, &pol);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
+/****************************************************************************
+****************************************************************************/
+
 static void display_job_info_1(JOB_INFO_1 *job)
 {
        fstring username = "", document = "", text_status = "";
 
-       if (job->username.buffer)
-               rpcstr_pull(username, job->username.buffer,
-                          sizeof(username), -1, STR_TERMINATE);
+       rpcstr_pull(username, job->username.buffer,
+                   sizeof(username), -1, STR_TERMINATE);
 
-       if (job->document.buffer)
-               rpcstr_pull(document, job->document.buffer,
-                          sizeof(document), -1, STR_TERMINATE);
+       rpcstr_pull(document, job->document.buffer,
+                   sizeof(document), -1, STR_TERMINATE);
 
-       if (job->text_status.buffer)
-               rpcstr_pull(text_status, job->text_status.buffer,
-                          sizeof(text_status), -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 = "";
 
-       if (job->username.buffer)
-               rpcstr_pull(username, job->username.buffer,
-                          sizeof(username), -1, STR_TERMINATE);
+       rpcstr_pull(username, job->username.buffer,
+                   sizeof(username), -1, STR_TERMINATE);
 
-       if (job->document.buffer)
-               rpcstr_pull(document, job->document.buffer,
-                          sizeof(document), -1, STR_TERMINATE);
+       rpcstr_pull(document, job->document.buffer,
+                   sizeof(document), -1, STR_TERMINATE);
 
-       if (job->text_status.buffer)
-               rpcstr_pull(text_status, job->text_status.buffer,
-                          sizeof(text_status), -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 NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_jobs(struct rpc_pipe_client *cli, 
                                      TALLOC_CTX *mem_ctx, int argc, 
-                                     char **argv)
+                                     const char **argv)
 {
        WERROR result;
-       uint32 needed, level = 1, num_jobs, i;
+       uint32 level = 1, num_jobs, i;
        BOOL got_hnd = False;
        pstring printername;
        fstring servername, user;
@@ -1736,7 +2170,7 @@ static NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli,
        
        if (argc < 2 || argc > 3) {
                printf("Usage: %s printername [level]\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
        
        if (argc == 3)
@@ -1744,15 +2178,14 @@ static NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli,
 
        /* Open printer handle */
 
-       slprintf(servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper(servername);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
        fstrcpy(user, cli->user_name);
-       fstrcpy(printername, argv[1]);
-       slprintf(printername, sizeof(pstring)-1, "\\\\%s\\", cli->desthost);
-       strupper(printername);
+       slprintf(printername, sizeof(servername)-1, "\\\\%s\\", cli->cli->desthost);
+       strupper_m(printername);
        pstrcat(printername, argv[1]);
 
-       result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
+       result = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
                                             "", MAXIMUM_ALLOWED_ACCESS, 
                                             servername, user, &hnd);
 
@@ -1763,25 +2196,19 @@ static NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli,
 
        /* Enumerate ports */
 
-       result = cli_spoolss_enumjobs(
-               cli, mem_ctx, 0, &needed, &hnd, level, 0, 1000,
+       result = rpccli_spoolss_enumjobs(cli, mem_ctx, &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]);
+                       display_job_info_1(&ctr.job.job_info_1[i]);
                        break;
                case 2:
-                       display_job_info_2(ctr.job.job_info_2[i]);
+                       display_job_info_2(&ctr.job.job_info_2[i]);
                        break;
                default:
                        d_printf("unknown info level %d\n", level);
@@ -1791,14 +2218,210 @@ static NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli,
        
 done:
        if (got_hnd)
-               cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
 }
 
-static NTSTATUS cmd_spoolss_rffpcnex(struct cli_state *cli, 
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_enum_data( struct rpc_pipe_client *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->cli->desthost);
+       strupper_m(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->cli->desthost);
+       strupper_m(printername);
+       pstrcat(printername, argv[1]);
+
+       result = rpccli_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 = rpccli_spoolss_enumprinterdata(cli, mem_ctx, &hnd, i, 0, 0,
+                                            &val_needed, &data_needed,
+                                            NULL);
+       while (W_ERROR_IS_OK(result)) {
+               REGISTRY_VALUE value;
+               result = rpccli_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)
+               rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_enum_data_ex( struct rpc_pipe_client *cli, 
+                                         TALLOC_CTX *mem_ctx, int argc, 
+                                         const char **argv)
+{
+       WERROR result;
+       uint32 i;
+       BOOL got_hnd = False;
+       pstring printername;
+       fstring servername, user;
+       const char *keyname = NULL;
+       POLICY_HND hnd;
+       REGVAL_CTR *ctr = NULL;
+
+       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->cli->desthost);
+       strupper_m(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->cli->desthost);
+       strupper_m(printername);
+       pstrcat(printername, argv[1]);
+
+       result = rpccli_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 */
+
+       if ( !(ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) 
+               return WERR_NOMEM;
+
+       result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, &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]));
+       }
+
+       TALLOC_FREE( ctr );
+
+done:
+       if (got_hnd)
+               rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_enum_printerkey( struct rpc_pipe_client *cli, 
+                                            TALLOC_CTX *mem_ctx, int argc, 
+                                            const char **argv)
+{
+       WERROR result;
+       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->cli->desthost);
+       strupper_m(servername);
+       fstrcpy(user, cli->user_name);
+       slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->cli->desthost);
+       strupper_m(printername);
+       pstrcat(printername, argv[1]);
+
+       result = rpccli_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 = rpccli_spoolss_enumprinterkey(cli, mem_ctx, &hnd, keyname, &keylist, NULL);
+
+       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;
+       }
+
+done:
+
+       SAFE_FREE(keylist);
+
+       if (got_hnd)
+               rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
+
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli, 
                                     TALLOC_CTX *mem_ctx, int argc, 
-                                    char **argv)
+                                    const char **argv)
 {
        fstring servername, printername;
        POLICY_HND hnd;
@@ -1814,14 +2437,14 @@ static NTSTATUS cmd_spoolss_rffpcnex(struct cli_state *cli,
 
        /* Open printer */
 
-       slprintf(servername, sizeof(fstring) - 1, "\\\\%s", cli->desthost);
-       strupper(servername);
+       slprintf(servername, sizeof(servername) - 1, "\\\\%s", cli->cli->desthost);
+       strupper_m(servername);
 
-       slprintf(printername, sizeof(fstring) - 1, "\\\\%s\\%s", cli->desthost,
+       slprintf(printername, sizeof(printername) - 1, "\\\\%s\\%s", cli->cli->desthost,
                 argv[1]);
-       strupper(printername);
+       strupper_m(printername);
 
-       result = cli_spoolss_open_printer_ex(
+       result = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
                servername, cli->user_name, &hnd);
 
@@ -1840,8 +2463,11 @@ static NTSTATUS cmd_spoolss_rffpcnex(struct cli_state *cli,
        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);
+       option.ctr.type = TALLOC_ARRAY(mem_ctx, SPOOL_NOTIFY_OPTION_TYPE, 2);
+       if (option.ctr.type == NULL) {
+               result = WERR_NOMEM;
+               goto done;
+       }
 
        ZERO_STRUCT(option.ctr.type[0]);
        option.ctr.type[0].type = PRINTER_NOTIFY_TYPE;
@@ -1857,10 +2483,10 @@ static NTSTATUS cmd_spoolss_rffpcnex(struct cli_state *cli,
 
        /* Send rffpcnex */
 
-       slprintf(servername, sizeof(fstring) - 1, "\\\\%s", myhostname());
-       strupper(servername);
+       slprintf(servername, sizeof(servername) - 1, "\\\\%s", myhostname());
+       strupper_m(servername);
 
-       result = cli_spoolss_rffpcnex(
+       result = rpccli_spoolss_rffpcnex(
                cli, mem_ctx, &hnd, 0, 0, servername, 123, &option);
 
        if (!W_ERROR_IS_OK(result)) {
@@ -1870,9 +2496,200 @@ static NTSTATUS cmd_spoolss_rffpcnex(struct cli_state *cli,
 
 done:          
        if (got_hnd)
-               cli_spoolss_close_printer(cli, mem_ctx, &hnd);
+               rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static BOOL compare_printer( struct rpc_pipe_client *cli1, POLICY_HND *hnd1,
+                             struct rpc_pipe_client *cli2, POLICY_HND *hnd2 )
+{
+       PRINTER_INFO_CTR ctr1, ctr2;
+       WERROR werror;
+       TALLOC_CTX *mem_ctx = talloc_init("compare_printer");
+
+       printf("Retrieving printer propertiesfor %s...", cli1->cli->desthost);
+       werror = rpccli_spoolss_getprinter( cli1, mem_ctx, hnd1, 2, &ctr1);
+       if ( !W_ERROR_IS_OK(werror) ) {
+               printf("failed (%s)\n", dos_errstr(werror));
+               talloc_destroy(mem_ctx);
+               return False;
+       }
+       printf("ok\n");
+
+       printf("Retrieving printer properties for %s...", cli2->cli->desthost);
+       werror = rpccli_spoolss_getprinter( cli2, mem_ctx, hnd2, 2, &ctr2);
+       if ( !W_ERROR_IS_OK(werror) ) {
+               printf("failed (%s)\n", dos_errstr(werror));
+               talloc_destroy(mem_ctx);
+               return False;
+       }
+       printf("ok\n");
+
+       talloc_destroy(mem_ctx);
+
+       return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static BOOL compare_printer_secdesc( struct rpc_pipe_client *cli1, POLICY_HND *hnd1,
+                                     struct rpc_pipe_client *cli2, POLICY_HND *hnd2 )
+{
+       PRINTER_INFO_CTR ctr1, ctr2;
+       WERROR werror;
+       TALLOC_CTX *mem_ctx = talloc_init("compare_printer_secdesc");
+       SEC_DESC *sd1, *sd2;
+       BOOL result = True;
+
+
+       printf("Retreiving printer security for %s...", cli1->cli->desthost);
+       werror = rpccli_spoolss_getprinter( cli1, mem_ctx, hnd1, 3, &ctr1);
+       if ( !W_ERROR_IS_OK(werror) ) {
+               printf("failed (%s)\n", dos_errstr(werror));
+               result = False;
+               goto done;
+       }
+       printf("ok\n");
+
+       printf("Retrieving printer security for %s...", cli2->cli->desthost);
+       werror = rpccli_spoolss_getprinter( cli2, mem_ctx, hnd2, 3, &ctr2);
+       if ( !W_ERROR_IS_OK(werror) ) {
+               printf("failed (%s)\n", dos_errstr(werror));
+               result = False;
+               goto done;
+       }
+       printf("ok\n");
+       
+
+       printf("++ ");
+
+       if ( (ctr1.printers_3 != ctr2.printers_3) && (!ctr1.printers_3 || !ctr2.printers_3) ) {
+               printf("NULL PRINTER_INFO_3!\n");
+               result = False;
+               goto done;
+       }
+       
+       sd1 = ctr1.printers_3->secdesc;
+       sd2 = ctr2.printers_3->secdesc;
+       
+       if ( (sd1 != sd2) && ( !sd1 || !sd2 ) ) {
+               printf("NULL secdesc!\n");
+               result = False;
+               goto done;
+       }
+       
+       if (!sec_desc_equal( sd1, sd2 ) ) {
+               printf("Security Descriptors *not* equal!\n");
+               result = False;
+               goto done;
+       }
+       
+       printf("Security descriptors match\n");
+       
+done:
+       talloc_destroy(mem_ctx);
+       return result;
+}
+
+
+/****************************************************************************
+****************************************************************************/
+
+static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli, 
+                                    TALLOC_CTX *mem_ctx, int argc, 
+                                    const char **argv)
+{
+       fstring printername, servername1, servername2;
+       pstring printername_path;
+       struct cli_state *cli_server1 = cli->cli;
+       struct cli_state *cli_server2 = NULL;
+       struct rpc_pipe_client *cli2 = NULL;
+       POLICY_HND hPrinter1, hPrinter2;
+       NTSTATUS nt_status;
+       WERROR werror;
+       
+       if ( argc != 3 )  {
+               printf("Usage: %s <printer> <server>\n", argv[0]);
+               return WERR_OK;
+       }
+       
+       fstrcpy( printername, argv[1] );
+       
+       fstr_sprintf( servername1, cli->cli->desthost );
+       fstrcpy( servername2, argv[2] );
+       strupper_m( servername1 );
+       strupper_m( servername2 );
+       
+       
+       /* first get the connection to the remote server */
+       
+       nt_status = cli_full_connection(&cli_server2, global_myname(), servername2, 
+                                       NULL, 0,
+                                       "IPC$", "IPC",  
+                                       cmdline_auth_info.username, 
+                                       lp_workgroup(),
+                                       cmdline_auth_info.password, 
+                                       cmdline_auth_info.use_kerberos ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
+                                       cmdline_auth_info.signing_state, NULL);
+                                       
+       if ( !NT_STATUS_IS_OK(nt_status) )
+               return WERR_GENERAL_FAILURE;
+
+       cli2 = cli_rpc_pipe_open_noauth(cli_server2, PI_SPOOLSS, &nt_status);
+       if (!cli2) {
+               printf("failed to open spoolss pipe on server %s (%s)\n",
+                       servername2, nt_errstr(nt_status));
+               return WERR_GENERAL_FAILURE;
+       }
+                                       
+       /* now open up both printers */
+
+       pstr_sprintf( printername_path, "\\\\%s\\%s", servername1, printername );
+       printf("Opening %s...", printername_path);
+       werror = rpccli_spoolss_open_printer_ex( cli, mem_ctx, printername_path, 
+               "", PRINTER_ALL_ACCESS, servername1, cli_server1->user_name, &hPrinter1);
+       if ( !W_ERROR_IS_OK(werror) ) {
+               printf("failed (%s)\n", dos_errstr(werror));
+               goto done;
+       }
+       printf("ok\n");
+       
+       pstr_sprintf( printername_path, "\\\\%s\\%s", servername2, printername );
+       printf("Opening %s...", printername_path);
+       werror = rpccli_spoolss_open_printer_ex( cli2, mem_ctx, printername_path,  
+               "", PRINTER_ALL_ACCESS, servername2, cli_server2->user_name, &hPrinter2 );
+       if ( !W_ERROR_IS_OK(werror) ) {
+                printf("failed (%s)\n", dos_errstr(werror));
+               goto done;
+       }
+       printf("ok\n");
+       
+       
+       compare_printer( cli, &hPrinter1, cli2, &hPrinter2 );
+       compare_printer_secdesc( cli, &hPrinter1, cli2, &hPrinter2 );
+#if 0
+       compare_printerdata( cli_server1, &hPrinter1, cli_server2, &hPrinter2 );
+#endif
+
+
+done:
+       /* cleanup */
+
+       printf("Closing printers...");  
+       rpccli_spoolss_close_printer( cli, mem_ctx, &hPrinter1 );
+       rpccli_spoolss_close_printer( cli2, mem_ctx, &hPrinter2 );
+       printf("ok\n");
+       
+       /* close the second remote connection */
+       
+       cli_shutdown( cli_server2 );
+       
+       return WERR_OK;
 }
 
 /* List of commands exported by this module */
@@ -1880,30 +2697,35 @@ struct cmd_set spoolss_commands[] = {
 
        { "SPOOLSS"  },
 
-       { "adddriver",          cmd_spoolss_addprinterdriver,   PIPE_SPOOLSS, "Add a print driver",                  "" },
-       { "addprinter",         cmd_spoolss_addprinterex,       PIPE_SPOOLSS, "Add a printer",                       "" },
-       { "deldriver",          cmd_spoolss_deletedriver,       PIPE_SPOOLSS, "Delete a printer driver",             "" },
-       { "enumdata",           cmd_spoolss_not_implemented,    PIPE_SPOOLSS, "Enumerate printer data (*)",          "" },
-       { "enumjobs",           cmd_spoolss_enum_jobs,          PIPE_SPOOLSS, "Enumerate print jobs",                "" },
-       { "enumports",          cmd_spoolss_enum_ports,         PIPE_SPOOLSS, "Enumerate printer ports",             "" },
-       { "enumdrivers",        cmd_spoolss_enum_drivers,       PIPE_SPOOLSS, "Enumerate installed printer drivers", "" },
-       { "enumprinters",       cmd_spoolss_enum_printers,      PIPE_SPOOLSS, "Enumerate printers",                  "" },
-       { "getdata",            cmd_spoolss_not_implemented,    PIPE_SPOOLSS, "Get print driver data (*)",           "" },
-       { "getdriver",          cmd_spoolss_getdriver,          PIPE_SPOOLSS, "Get print driver information",        "" },
-       { "getdriverdir",       cmd_spoolss_getdriverdir,       PIPE_SPOOLSS, "Get print driver upload directory",   "" },
-       { "getprinter",         cmd_spoolss_getprinter,         PIPE_SPOOLSS, "Get printer info",                    "" },
-       { "getprintprocdir",    cmd_spoolss_getprintprocdir,    PIPE_SPOOLSS, "Get print processor directory",       "" },
-       { "openprinter",        cmd_spoolss_open_printer_ex,    PIPE_SPOOLSS, "Open printer handle",                 "" },
-       { "setdriver",          cmd_spoolss_setdriver,          PIPE_SPOOLSS, "Set printer driver",                  "" },
-       { "getprintprocdir",    cmd_spoolss_getprintprocdir,    PIPE_SPOOLSS, "Get print processor directory",       "" },
-       { "addform",            cmd_spoolss_addform,            PIPE_SPOOLSS, "Add form",                            "" },
-       { "setform",            cmd_spoolss_setform,            PIPE_SPOOLSS, "Set form",                            "" },
-       { "getform",            cmd_spoolss_getform,            PIPE_SPOOLSS, "Get form",                            "" },
-       { "deleteform",         cmd_spoolss_deleteform,         PIPE_SPOOLSS, "Delete form",                         "" },
-       { "enumforms",          cmd_spoolss_enum_forms,         PIPE_SPOOLSS, "Enumerate forms",                     "" },
-       { "setprinter",         cmd_spoolss_setprinter,         PIPE_SPOOLSS, "Set printer comment",                 "" },
-       { "setprinterdata",     cmd_spoolss_setprinterdata,     PIPE_SPOOLSS, "Set REG_SZ printer data",             "" },
-       { "rffpcnex",           cmd_spoolss_rffpcnex,           PIPE_SPOOLSS, "Rffpcnex test", "" },
+       { "adddriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver,   PI_SPOOLSS, NULL, "Add a print driver",                  "" },
+       { "addprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex,       PI_SPOOLSS, NULL, "Add a printer",                       "" },
+       { "deldriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver,       PI_SPOOLSS, NULL, "Delete a printer driver",             "" },
+       { "deldriverex",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriverex,     PI_SPOOLSS, NULL, "Delete a printer driver with files",  "" },
+       { "enumdata",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,          PI_SPOOLSS, NULL, "Enumerate printer data",              "" },
+       { "enumdataex",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex,       PI_SPOOLSS, NULL, "Enumerate printer data for a key",    "" },
+       { "enumkey",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey,    PI_SPOOLSS, NULL, "Enumerate printer keys",              "" },
+       { "enumjobs",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,          PI_SPOOLSS, NULL, "Enumerate print jobs",                "" },
+       { "enumports",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,         PI_SPOOLSS, NULL, "Enumerate printer ports",             "" },
+       { "enumdrivers",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers,       PI_SPOOLSS, NULL, "Enumerate installed printer drivers", "" },
+       { "enumprinters",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers,      PI_SPOOLSS, NULL, "Enumerate printers",                  "" },
+       { "getdata",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata,     PI_SPOOLSS, NULL, "Get print driver data",               "" },
+       { "getdataex",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdataex,   PI_SPOOLSS, NULL, "Get printer driver data with keyname", ""},
+       { "getdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,          PI_SPOOLSS, NULL, "Get print driver information",        "" },
+       { "getdriverdir",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir,       PI_SPOOLSS, NULL, "Get print driver upload directory",   "" },
+       { "getprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,         PI_SPOOLSS, NULL, "Get printer info",                    "" },
+       { "openprinter",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex,    PI_SPOOLSS, NULL, "Open printer handle",                 "" },
+       { "setdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,          PI_SPOOLSS, NULL, "Set printer driver",                  "" },
+       { "getprintprocdir",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    PI_SPOOLSS, NULL, "Get print processor directory",       "" },
+       { "addform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,            PI_SPOOLSS, NULL, "Add form",                            "" },
+       { "setform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,            PI_SPOOLSS, NULL, "Set form",                            "" },
+       { "getform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,            PI_SPOOLSS, NULL, "Get form",                            "" },
+       { "deleteform",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,         PI_SPOOLSS, NULL, "Delete form",                         "" },
+       { "enumforms",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,         PI_SPOOLSS, NULL, "Enumerate forms",                     "" },
+       { "setprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,         PI_SPOOLSS, NULL, "Set printer comment",                 "" },
+       { "setprintername",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprintername,     PI_SPOOLSS, NULL, "Set printername",                 "" },
+       { "setprinterdata",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata,     PI_SPOOLSS, NULL, "Set REG_SZ printer data",             "" },
+       { "rffpcnex",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,           PI_SPOOLSS, NULL, "Rffpcnex test", "" },
+       { "printercmp",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_printercmp,         PI_SPOOLSS, NULL, "Printer comparison test", "" },
 
        { NULL }
 };