s3: Use dbwrap_parse_record in fetch_share_mode_unlocked
[kai/samba.git] / source3 / rpcclient / cmd_spoolss.c
index 50f1209c454c3bfc3b3335df87ff67573fa0096f..b189fd7379ec6ac12c4af27e8ac0fba6d0638c16 100644 (file)
 
 #include "includes.h"
 #include "rpcclient.h"
-#include "../librpc/gen_ndr/cli_spoolss.h"
+#include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
-#include "registry.h"
-#include "registry/reg_objects.h"
 #include "nt_printing.h"
+#include "../libcli/security/display_sec.h"
+#include "../libcli/security/security_descriptor.h"
+#include "../libcli/registry/util_reg.h"
+#include "libsmb/libsmb.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \
@@ -76,11 +78,11 @@ static const char *cmd_spoolss_get_short_archi(const char *long_archi)
 {
         int i=-1;
 
-        DEBUG(107,("Getting architecture dependant directory\n"));
+        DEBUG(107,("Getting architecture dependent directory\n"));
         do {
                 i++;
         } while ( (archi_table[i].long_archi!=NULL ) &&
-                  StrCaseCmp(long_archi, archi_table[i].long_archi) );
+                  strcasecmp_m(long_archi, archi_table[i].long_archi) );
 
         if (archi_table[i].long_archi==NULL) {
                 DEBUGADD(10,("Unknown architecture [%s] !\n", long_archi));
@@ -107,6 +109,7 @@ static WERROR cmd_spoolss_open_printer_ex(struct rpc_pipe_client *cli,
        WERROR          werror;
        struct policy_handle    hnd;
        uint32_t access_mask = PRINTER_ALL_ACCESS;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2) {
                printf("Usage: %s <printername> [access_mask]\n", argv[0]);
@@ -125,7 +128,7 @@ static WERROR cmd_spoolss_open_printer_ex(struct rpc_pipe_client *cli,
                                               &hnd);
        if (W_ERROR_IS_OK(werror)) {
                printf("Printer %s opened successfully\n", argv[1]);
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, &werror);
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &werror);
 
                if (!W_ERROR_IS_OK(werror)) {
                        printf("Error closing printer handle! (%s)\n",
@@ -148,6 +151,7 @@ static WERROR cmd_spoolss_open_printer(struct rpc_pipe_client *cli,
        uint32_t access_mask = PRINTER_ALL_ACCESS;
        NTSTATUS status;
        struct spoolss_DevmodeContainer devmode_ctr;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        ZERO_STRUCT(devmode_ctr);
 
@@ -162,16 +166,19 @@ static WERROR cmd_spoolss_open_printer(struct rpc_pipe_client *cli,
 
        /* Open the printer handle */
 
-       status = rpccli_spoolss_OpenPrinter(cli, mem_ctx,
+       status = dcerpc_spoolss_OpenPrinter(b, mem_ctx,
                                            argv[1],
                                            NULL,
                                            devmode_ctr,
                                            access_mask,
                                            &hnd,
                                            &werror);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
        if (W_ERROR_IS_OK(werror)) {
                printf("Printer %s opened successfully\n", argv[1]);
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, &werror);
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &werror);
 
                if (!W_ERROR_IS_OK(werror)) {
                        printf("Error closing printer handle! (%s)\n",
@@ -518,6 +525,7 @@ static WERROR cmd_spoolss_setprinter(struct rpc_pipe_client *cli,
        const char      *printername, *comment = NULL;
        struct spoolss_DevmodeContainer devmode_ctr;
        struct sec_desc_buf secdesc_ctr;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc == 1 || argc > 3) {
                printf("Usage: %s printername comment\n", argv[0]);
@@ -560,19 +568,25 @@ static WERROR cmd_spoolss_setprinter(struct rpc_pipe_client *cli,
        info_ctr.level = 2;
        info_ctr.info.info2 = &info2;
 
-       status = rpccli_spoolss_SetPrinter(cli, mem_ctx,
+       status = dcerpc_spoolss_SetPrinter(b, mem_ctx,
                                           &pol,
                                           &info_ctr,
                                           &devmode_ctr,
                                           &secdesc_ctr,
                                           0, /* command */
                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (W_ERROR_IS_OK(result))
                printf("Success in setting comment.\n");
 
  done:
-       if (is_valid_policy_hnd(&pol))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+       if (is_valid_policy_hnd(&pol)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
+       }
 
        return result;
 }
@@ -595,6 +609,7 @@ static WERROR cmd_spoolss_setprintername(struct rpc_pipe_client *cli,
        struct spoolss_SetPrinterInfo2 info2;
        struct spoolss_DevmodeContainer devmode_ctr;
        struct sec_desc_buf secdesc_ctr;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        ZERO_STRUCT(devmode_ctr);
        ZERO_STRUCT(secdesc_ctr);
@@ -636,19 +651,25 @@ static WERROR cmd_spoolss_setprintername(struct rpc_pipe_client *cli,
        info_ctr.level = 2;
        info_ctr.info.info2 = &info2;
 
-       status = rpccli_spoolss_SetPrinter(cli, mem_ctx,
+       status = dcerpc_spoolss_SetPrinter(b, mem_ctx,
                                           &pol,
                                           &info_ctr,
                                           &devmode_ctr,
                                           &secdesc_ctr,
                                           0, /* command */
                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (W_ERROR_IS_OK(result))
                printf("Success in setting printername.\n");
 
  done:
-       if (is_valid_policy_hnd(&pol))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+       if (is_valid_policy_hnd(&pol)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
+       }
 
        return result;
 }
@@ -665,6 +686,7 @@ static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli,
        uint32_t        level = 1;
        const char      *printername;
        union spoolss_PrinterInfo info;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc == 1 || argc > 3) {
                printf("Usage: %s <printername> [level]\n", argv[0]);
@@ -731,7 +753,8 @@ static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli,
        }
  done:
        if (is_valid_policy_hnd(&pol)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
        }
 
        return result;
@@ -740,25 +763,26 @@ static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli,
 /****************************************************************************
 ****************************************************************************/
 
-static void display_reg_value(struct regval_blob *value)
+static void display_reg_value(const char *name, enum winreg_Type type, DATA_BLOB blob)
 {
        const char *text = NULL;
-       DATA_BLOB blob;
 
-       switch(regval_type(value)) {
+       switch(type) {
        case REG_DWORD:
-               printf("%s: REG_DWORD: 0x%08x\n", regval_name(value),
-                      *((uint32_t *) regval_data_p(value)));
+               if (blob.length == sizeof(uint32)) {
+                       printf("%s: REG_DWORD: 0x%08x\n", name, IVAL(blob.data,0));
+               } else {
+                       printf("%s: REG_DWORD: <invalid>\n", name);
+               }
                break;
        case REG_SZ:
-               blob = data_blob_const(regval_data_p(value), regval_size(value));
                pull_reg_sz(talloc_tos(), &blob, &text);
-               printf("%s: REG_SZ: %s\n", regval_name(value), text ? text : "");
+               printf("%s: REG_SZ: %s\n", name, text ? text : "");
                break;
        case REG_BINARY: {
-               char *hex = hex_encode_talloc(NULL, regval_data_p(value), regval_size(value));
+               char *hex = hex_encode_talloc(NULL, blob.data, blob.length);
                size_t i, len;
-               printf("%s: REG_BINARY:", regval_name(value));
+               printf("%s: REG_BINARY:", name);
                len = strlen(hex);
                for (i=0; i<len; i++) {
                        if (hex[i] == '\0') {
@@ -776,14 +800,13 @@ static void display_reg_value(struct regval_blob *value)
        case REG_MULTI_SZ: {
                uint32_t i;
                const char **values;
-               blob = data_blob_const(regval_data_p(value), regval_size(value));
 
                if (!pull_reg_multi_sz(NULL, &blob, &values)) {
                        d_printf("pull_reg_multi_sz failed\n");
                        break;
                }
 
-               printf("%s: REG_MULTI_SZ: \n", regval_name(value));
+               printf("%s: REG_MULTI_SZ: \n", name);
                for (i=0; values[i] != NULL; i++) {
                        d_printf("%s\n", values[i]);
                }
@@ -791,7 +814,7 @@ static void display_reg_value(struct regval_blob *value)
                break;
        }
        default:
-               printf("%s: unknown type %d\n", regval_name(value), regval_type(value));
+               printf("%s: unknown type %d\n", name, type);
        }
 
 }
@@ -867,6 +890,7 @@ static WERROR cmd_spoolss_getprinterdata(struct rpc_pipe_client *cli,
        enum winreg_Type type;
        uint8_t *data;
        uint32_t needed;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 3) {
                printf("Usage: %s <printername> <valuename>\n", argv[0]);
@@ -909,8 +933,10 @@ static WERROR cmd_spoolss_getprinterdata(struct rpc_pipe_client *cli,
        display_printer_data(valuename, type, data, needed);
 
  done:
-       if (is_valid_policy_hnd(&pol))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+       if (is_valid_policy_hnd(&pol)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
+       }
 
        return result;
 }
@@ -932,6 +958,7 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli,
        uint8_t *data = NULL;
        uint32_t offered = 0;
        uint32_t needed;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 4) {
                printf("Usage: %s <printername> <keyname> <valuename>\n",
@@ -966,7 +993,7 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       status = rpccli_spoolss_GetPrinterDataEx(cli, mem_ctx,
+       status = dcerpc_spoolss_GetPrinterDataEx(b, mem_ctx,
                                                 &pol,
                                                 keyname,
                                                 valuename,
@@ -975,13 +1002,17 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli,
                                                 offered,
                                                 &needed,
                                                 &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (W_ERROR_EQUAL(result, WERR_MORE_DATA)) {
                offered = needed;
                data = talloc_zero_array(mem_ctx, uint8_t, offered);
                if (!data) {
                        goto done;
                }
-               status = rpccli_spoolss_GetPrinterDataEx(cli, mem_ctx,
+               status = dcerpc_spoolss_GetPrinterDataEx(b, mem_ctx,
                                                         &pol,
                                                         keyname,
                                                         valuename,
@@ -993,6 +1024,7 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli,
        }
 
        if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
                goto done;
        }
 
@@ -1005,8 +1037,10 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli,
 
 
  done:
-       if (is_valid_policy_hnd(&pol))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+       if (is_valid_policy_hnd(&pol)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
+       }
 
        return result;
 }
@@ -1238,6 +1272,7 @@ static WERROR cmd_spoolss_getdriver(struct rpc_pipe_client *cli,
        union spoolss_DriverInfo info;
        uint32_t server_major_version;
        uint32_t server_minor_version;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if ((argc == 1) || (argc > 3)) {
                printf("Usage: %s <printername> [level]\n", argv[0]);
@@ -1318,7 +1353,8 @@ static WERROR cmd_spoolss_getdriver(struct rpc_pipe_client *cli,
        /* Cleanup */
 
        if (is_valid_policy_hnd(&pol)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
        }
 
        if (success) {
@@ -1480,6 +1516,7 @@ static WERROR cmd_spoolss_getdriverdir(struct rpc_pipe_client *cli,
        uint32_t offered;
        union spoolss_DriverDirectoryInfo info;
        uint32_t needed;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 2) {
                printf("Usage: %s [environment]\n", argv[0]);
@@ -1494,7 +1531,7 @@ static WERROR cmd_spoolss_getdriverdir(struct rpc_pipe_client *cli,
 
        /* Get the directory.  Only use Info level 1 */
 
-       status = rpccli_spoolss_GetPrinterDriverDirectory(cli, mem_ctx,
+       status = dcerpc_spoolss_GetPrinterDriverDirectory(b, mem_ctx,
                                                          cli->srv_name_slash,
                                                          env,
                                                          1,
@@ -1503,11 +1540,14 @@ static WERROR cmd_spoolss_getdriverdir(struct rpc_pipe_client *cli,
                                                          NULL, /* info */
                                                          &needed,
                                                          &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
        if (W_ERROR_EQUAL(result, WERR_INSUFFICIENT_BUFFER)) {
                offered = needed;
                buffer = data_blob_talloc_zero(mem_ctx, needed);
 
-               status = rpccli_spoolss_GetPrinterDriverDirectory(cli, mem_ctx,
+               status = dcerpc_spoolss_GetPrinterDriverDirectory(b, mem_ctx,
                                                                  cli->srv_name_slash,
                                                                  env,
                                                                  1,
@@ -1516,6 +1556,9 @@ static WERROR cmd_spoolss_getdriverdir(struct rpc_pipe_client *cli,
                                                                  &info,
                                                                  &needed,
                                                                  &result);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ntstatus_to_werror(status);
+               }
        }
 
        if (W_ERROR_IS_OK(result)) {
@@ -1572,7 +1615,7 @@ static char *get_driver_3_param(TALLOC_CTX *mem_ctx, char *str,
           parameter because two consecutive delimiters
           will not return an empty string.  See man strtok(3)
           for details */
-       if (ptr && (StrCaseCmp(ptr, "NULL") == 0)) {
+       if (ptr && (strcasecmp_m(ptr, "NULL") == 0)) {
                ptr = NULL;
        }
 
@@ -1661,6 +1704,7 @@ static WERROR cmd_spoolss_addprinterdriver(struct rpc_pipe_client *cli,
        struct spoolss_AddDriverInfo3 info3;
        const char              *arch;
        char                    *driver_args;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* parse the command arguments */
        if (argc != 3 && argc != 4)
@@ -1679,7 +1723,7 @@ static WERROR cmd_spoolss_addprinterdriver(struct rpc_pipe_client *cli,
 
        arch = cmd_spoolss_get_short_archi(argv[1]);
        if (!arch) {
-               printf ("Error Unknown architechture [%s]\n", argv[1]);
+               printf ("Error Unknown architecture [%s]\n", argv[1]);
                return WERR_INVALID_PARAM;
        }
 
@@ -1704,7 +1748,7 @@ static WERROR cmd_spoolss_addprinterdriver(struct rpc_pipe_client *cli,
        info_ctr.level          = level;
        info_ctr.info.info3     = &info3;
 
-       status = rpccli_spoolss_AddPrinterDriver(cli, mem_ctx,
+       status = dcerpc_spoolss_AddPrinterDriver(b, mem_ctx,
                                                 cli->srv_name_slash,
                                                 &info_ctr,
                                                 &result);
@@ -1792,6 +1836,7 @@ static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli,
        struct spoolss_SetPrinterInfo2 info2;
        struct spoolss_DevmodeContainer devmode_ctr;
        struct sec_desc_buf secdesc_ctr;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        ZERO_STRUCT(devmode_ctr);
        ZERO_STRUCT(secdesc_ctr);
@@ -1834,16 +1879,20 @@ static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli,
        info_ctr.level = 2;
        info_ctr.info.info2 = &info2;
 
-       status = rpccli_spoolss_SetPrinter(cli, mem_ctx,
+       status = dcerpc_spoolss_SetPrinter(b, mem_ctx,
                                           &pol,
                                           &info_ctr,
                                           &devmode_ctr,
                                           &secdesc_ctr,
                                           0, /* command */
                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (!W_ERROR_IS_OK(result)) {
                printf("SetPrinter call failed!\n");
-               goto done;;
+               goto done;
        }
 
        printf("Successfully set %s to driver %s.\n", argv[1], argv[2]);
@@ -1851,8 +1900,10 @@ static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli,
 done:
        /* Cleanup */
 
-       if (is_valid_policy_hnd(&pol))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+       if (is_valid_policy_hnd(&pol)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
+       }
 
        return result;
 }
@@ -1867,6 +1918,7 @@ static WERROR cmd_spoolss_deletedriverex(struct rpc_pipe_client *cli,
 {
        WERROR result, ret = WERR_UNKNOWN_PRINTER_DRIVER;
        NTSTATUS status;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        int   i;
        int vers = -1;
@@ -1875,38 +1927,40 @@ static WERROR cmd_spoolss_deletedriverex(struct rpc_pipe_client *cli,
        uint32_t delete_flags = 0;
 
        /* parse the command arguments */
-       if (argc < 2 || argc > 4) {
-               printf ("Usage: %s <driver> [arch] [version]\n", argv[0]);
+       if (argc < 2 || argc > 5) {
+               printf("Usage: %s <driver> [arch] [version] [flags]\n", argv[0]);
                return WERR_OK;
        }
 
        if (argc >= 3)
                arch = argv[2];
-       if (argc == 4)
-               vers = atoi (argv[3]);
-
-       if (vers >= 0) {
+       if (argc >= 4) {
+               vers = atoi(argv[3]);
                delete_flags |= DPD_DELETE_SPECIFIC_VERSION;
        }
+       if (argc == 5)
+               delete_flags = atoi(argv[4]);
 
        /* delete the driver for all architectures */
        for (i=0; archi_table[i].long_archi; i++) {
 
-               if (arch &&  !strequal( archi_table[i].long_archi, arch))
+               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 */
-               status = rpccli_spoolss_DeletePrinterDriverEx(cli, mem_ctx,
+               status = dcerpc_spoolss_DeletePrinterDriverEx(b, mem_ctx,
                                                              cli->srv_name_slash,
                                                              archi_table[i].long_archi,
                                                              argv[1],
                                                              delete_flags,
                                                              archi_table[i].version,
                                                              &result);
-
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ntstatus_to_werror(status);
+               }
                if ( !W_ERROR_IS_OK(result) )
                {
                        if ( !W_ERROR_EQUAL(result, WERR_UNKNOWN_PRINTER_DRIVER) ) {
@@ -1936,6 +1990,7 @@ static WERROR cmd_spoolss_deletedriver(struct rpc_pipe_client *cli,
        WERROR result = WERR_OK;
        NTSTATUS status;
        int                     i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* parse the command arguments */
        if (argc != 2) {
@@ -1945,20 +2000,23 @@ static WERROR cmd_spoolss_deletedriver(struct rpc_pipe_client *cli,
 
        /* delete the driver for all architectures */
        for (i=0; archi_table[i].long_archi; i++) {
+               result = WERR_OK;
+
                /* make the call to remove the driver */
-               status = rpccli_spoolss_DeletePrinterDriver(cli, mem_ctx,
+               status = dcerpc_spoolss_DeletePrinterDriver(b, mem_ctx,
                                                            cli->srv_name_slash,
                                                            archi_table[i].long_archi,
                                                            argv[1],
                                                            &result);
                if (!NT_STATUS_IS_OK(status)) {
-                       return result;
+                       result = ntstatus_to_werror(status);
+                       continue;
                }
                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",
+                               printf ("Failed to remove driver %s for arch [%s] - error %s!\n",
                                        argv[1], archi_table[i].long_archi,
-                                       W_ERROR_V(result));
+                                       win_errstr(result));
                        }
                } else {
                        printf ("Driver %s removed for arch [%s].\n", argv[1],
@@ -1983,6 +2041,7 @@ static WERROR cmd_spoolss_getprintprocdir(struct rpc_pipe_client *cli,
        uint32_t offered;
        union spoolss_PrintProcessorDirectoryInfo info;
        uint32_t needed;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* parse the command arguments */
        if (argc > 2) {
@@ -1994,7 +2053,7 @@ static WERROR cmd_spoolss_getprintprocdir(struct rpc_pipe_client *cli,
                environment = argv[1];
        }
 
-       status = rpccli_spoolss_GetPrintProcessorDirectory(cli, mem_ctx,
+       status = dcerpc_spoolss_GetPrintProcessorDirectory(b, mem_ctx,
                                                           cli->srv_name_slash,
                                                           environment,
                                                           1,
@@ -2003,11 +2062,14 @@ static WERROR cmd_spoolss_getprintprocdir(struct rpc_pipe_client *cli,
                                                           NULL, /* info */
                                                           &needed,
                                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
        if (W_ERROR_EQUAL(result, WERR_INSUFFICIENT_BUFFER)) {
                offered = needed;
                buffer = data_blob_talloc_zero(mem_ctx, needed);
 
-               status = rpccli_spoolss_GetPrintProcessorDirectory(cli, mem_ctx,
+               status = dcerpc_spoolss_GetPrintProcessorDirectory(b, mem_ctx,
                                                                   cli->srv_name_slash,
                                                                   environment,
                                                                   1,
@@ -2016,6 +2078,9 @@ static WERROR cmd_spoolss_getprintprocdir(struct rpc_pipe_client *cli,
                                                                   &info,
                                                                   &needed,
                                                                   &result);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ntstatus_to_werror(status);
+               }
        }
 
        if (W_ERROR_IS_OK(result)) {
@@ -2039,6 +2104,7 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
        struct spoolss_AddFormInfo1 info1;
        struct spoolss_AddFormInfo2 info2;
        uint32_t level = 1;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* Parse the command arguments */
 
@@ -2097,20 +2163,28 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
                info.info2 = &info2;
 
                break;
+       default:
+               werror = WERR_INVALID_PARAM;
+               goto done;
        }
 
        /* Add the form */
 
 
-       status = rpccli_spoolss_AddForm(cli, mem_ctx,
+       status = dcerpc_spoolss_AddForm(b, mem_ctx,
                                        &handle,
                                        level,
                                        info,
                                        &werror);
-
+       if (!NT_STATUS_IS_OK(status)) {
+               werror = ntstatus_to_werror(status);
+               goto done;
+       }
  done:
-       if (is_valid_policy_hnd(&handle))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
+       if (is_valid_policy_hnd(&handle)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &handle, &_result);
+       }
 
        return werror;
 }
@@ -2127,6 +2201,7 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
        const char *printername;
        union spoolss_AddFormInfo info;
        struct spoolss_AddFormInfo1 info1;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* Parse the command arguments */
 
@@ -2161,16 +2236,21 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 
        /* Set the form */
 
-       status = rpccli_spoolss_SetForm(cli, mem_ctx,
+       status = dcerpc_spoolss_SetForm(b, mem_ctx,
                                        &handle,
                                        argv[2],
                                        1,
                                        info,
                                        &werror);
-
+       if (!NT_STATUS_IS_OK(status)) {
+               werror = ntstatus_to_werror(status);
+               goto done;
+       }
  done:
-       if (is_valid_policy_hnd(&handle))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
+       if (is_valid_policy_hnd(&handle)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &handle, &_result);
+       }
 
        return werror;
 }
@@ -2244,6 +2324,7 @@ static WERROR cmd_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
        union spoolss_FormInfo info;
        uint32_t needed;
        uint32_t level = 1;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* Parse the command arguments */
 
@@ -2269,7 +2350,7 @@ static WERROR cmd_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 
        /* Get the form */
 
-       status = rpccli_spoolss_GetForm(cli, mem_ctx,
+       status = dcerpc_spoolss_GetForm(b, mem_ctx,
                                        &handle,
                                        argv[2],
                                        level,
@@ -2278,10 +2359,14 @@ static WERROR cmd_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
                                        &info,
                                        &needed,
                                        &werror);
+       if (!NT_STATUS_IS_OK(status)) {
+               werror = ntstatus_to_werror(status);
+               goto done;
+       }
        if (W_ERROR_EQUAL(werror, WERR_INSUFFICIENT_BUFFER)) {
                buffer = data_blob_talloc_zero(mem_ctx, needed);
                offered = needed;
-               status = rpccli_spoolss_GetForm(cli, mem_ctx,
+               status = dcerpc_spoolss_GetForm(b, mem_ctx,
                                                &handle,
                                                argv[2],
                                                level,
@@ -2290,10 +2375,14 @@ static WERROR cmd_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
                                                &info,
                                                &needed,
                                                &werror);
+               if (!NT_STATUS_IS_OK(status)) {
+                       werror = ntstatus_to_werror(status);
+                       goto done;
+               }
        }
 
-       if (!NT_STATUS_IS_OK(status)) {
-               return werror;
+       if (!W_ERROR_IS_OK(werror)) {
+               goto done;
        }
 
        switch (level) {
@@ -2306,8 +2395,10 @@ static WERROR cmd_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
        }
 
  done:
-       if (is_valid_policy_hnd(&handle))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
+       if (is_valid_policy_hnd(&handle)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &handle, &_result);
+       }
 
        return werror;
 }
@@ -2323,6 +2414,7 @@ static WERROR cmd_spoolss_deleteform(struct rpc_pipe_client *cli,
        WERROR werror;
        NTSTATUS status;
        const char *printername;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* Parse the command arguments */
 
@@ -2344,17 +2436,20 @@ static WERROR cmd_spoolss_deleteform(struct rpc_pipe_client *cli,
 
        /* Delete the form */
 
-       status = rpccli_spoolss_DeleteForm(cli, mem_ctx,
+       status = dcerpc_spoolss_DeleteForm(b, mem_ctx,
                                           &handle,
                                           argv[2],
                                           &werror);
        if (!NT_STATUS_IS_OK(status)) {
-               return ntstatus_to_werror(status);
+               werror = ntstatus_to_werror(status);
+               goto done;
        }
 
  done:
-       if (is_valid_policy_hnd(&handle))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
+       if (is_valid_policy_hnd(&handle)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &handle, &_result);
+       }
 
        return werror;
 }
@@ -2371,6 +2466,7 @@ static WERROR cmd_spoolss_enum_forms(struct rpc_pipe_client *cli,
        const char *printername;
        uint32_t num_forms, level = 1, i;
        union spoolss_FormInfo *forms;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* Parse the command arguments */
 
@@ -2420,8 +2516,10 @@ static WERROR cmd_spoolss_enum_forms(struct rpc_pipe_client *cli,
        }
 
  done:
-       if (is_valid_policy_hnd(&handle))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
+       if (is_valid_policy_hnd(&handle)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &handle, &_result);
+       }
 
        return werror;
 }
@@ -2436,11 +2534,12 @@ static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli,
        WERROR result;
        NTSTATUS status;
        const char *printername;
-       struct policy_handle pol;
+       struct policy_handle pol = { 0, };
        union spoolss_PrinterInfo info;
        enum winreg_Type type;
        union spoolss_PrinterData data;
        DATA_BLOB blob;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* parse the command arguments */
        if (argc < 5) {
@@ -2515,6 +2614,8 @@ static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli,
                int i, num_strings;
                const char **strings = NULL;
 
+               num_strings = 0;
+
                for (i=4; i<argc; i++) {
                        if (strcmp(argv[i], "NULL") == 0) {
                                argv[i] = "";
@@ -2547,13 +2648,18 @@ static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       status = rpccli_spoolss_SetPrinterData(cli, mem_ctx,
+       status = dcerpc_spoolss_SetPrinterData(b, mem_ctx,
                                               &pol,
                                               argv[3], /* value_name */
                                               type,
                                               blob.data,
                                               blob.length,
                                               &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf ("Unable to set [%s=%s]!\n", argv[3], argv[4]);
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (!W_ERROR_IS_OK(result)) {
                printf ("Unable to set [%s=%s]!\n", argv[3], argv[4]);
                goto done;
@@ -2575,7 +2681,8 @@ static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli,
 done:
        /* cleanup */
        if (is_valid_policy_hnd(&pol)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &pol, &_result);
        }
 
        return result;
@@ -2634,6 +2741,7 @@ static WERROR cmd_spoolss_enum_jobs(struct rpc_pipe_client *cli,
        const char *printername;
        struct policy_handle hnd;
        union spoolss_JobInfo *info;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2 || argc > 3) {
                printf("Usage: %s printername [level]\n", argv[0]);
@@ -2685,7 +2793,8 @@ static WERROR cmd_spoolss_enum_jobs(struct rpc_pipe_client *cli,
 
 done:
        if (is_valid_policy_hnd(&hnd)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &_result);
        }
 
        return result;
@@ -2704,6 +2813,7 @@ static WERROR cmd_spoolss_get_job(struct rpc_pipe_client *cli,
        uint32_t job_id;
        uint32_t level = 1;
        union spoolss_JobInfo info;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 3 || argc > 4) {
                printf("Usage: %s printername job_id [level]\n", argv[0]);
@@ -2761,7 +2871,8 @@ static WERROR cmd_spoolss_get_job(struct rpc_pipe_client *cli,
 
 done:
        if (is_valid_policy_hnd(&hnd)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &_result);
        }
 
        return result;
@@ -2807,6 +2918,7 @@ static WERROR cmd_spoolss_set_job(struct rpc_pipe_client *cli,
        struct policy_handle hnd;
        uint32_t job_id;
        enum spoolss_JobControl command;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 4) {
                printf("Usage: %s printername job_id command\n", argv[0]);
@@ -2832,20 +2944,24 @@ static WERROR cmd_spoolss_set_job(struct rpc_pipe_client *cli,
 
        /* Set Job */
 
-       status = rpccli_spoolss_SetJob(cli, mem_ctx,
+       status = dcerpc_spoolss_SetJob(b, mem_ctx,
                                       &hnd,
                                       job_id,
                                       NULL,
                                       command,
                                       &result);
-
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
 done:
        if (is_valid_policy_hnd(&hnd)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &_result);
        }
 
        return result;
@@ -2860,16 +2976,13 @@ static WERROR cmd_spoolss_enum_data(struct rpc_pipe_client *cli,
 {
        WERROR result;
        NTSTATUS status;
-       uint32_t i = 0;
        const char *printername;
        struct policy_handle hnd;
-       uint32_t value_offered = 0;
-       const char *value_name = NULL;
        uint32_t value_needed;
        enum winreg_Type type;
-       uint8_t *data = NULL;
-       uint32_t data_offered = 0;
        uint32_t data_needed;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+       struct spoolss_EnumPrinterData r;
 
        if (argc != 2) {
                printf("Usage: %s printername\n", argv[0]);
@@ -2890,70 +3003,56 @@ static WERROR cmd_spoolss_enum_data(struct rpc_pipe_client *cli,
 
        /* Enumerate data */
 
-       status = rpccli_spoolss_EnumPrinterData(cli, mem_ctx,
-                                               &hnd,
-                                               i,
-                                               value_name,
-                                               value_offered,
-                                               &value_needed,
-                                               &type,
-                                               data,
-                                               data_offered,
-                                               &data_needed,
-                                               &result);
-
+       r.in.handle = &hnd;
+       r.in.enum_index = 0;
+       r.in.value_offered = 0;
+       r.in.data_offered = 0;
+       r.out.value_name = NULL;
+       r.out.value_needed = &value_needed;
+       r.out.type = &type;
+       r.out.data = NULL;
+       r.out.data_needed = &data_needed;
+
+       status = dcerpc_spoolss_EnumPrinterData_r(b, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                result = ntstatus_to_werror(status);
                goto done;
        }
 
-       if (!W_ERROR_IS_OK(result)) {
+       if (!W_ERROR_IS_OK(r.out.result)) {
+               result = r.out.result;
                goto done;
        }
 
-       data_offered    = data_needed;
-       value_offered   = value_needed;
-       data            = talloc_zero_array(mem_ctx, uint8_t, data_needed);
-       value_name      = talloc_zero_array(mem_ctx, char, value_needed);
-
-       while (NT_STATUS_IS_OK(status) && W_ERROR_IS_OK(result)) {
-
-               status = rpccli_spoolss_EnumPrinterData(cli, mem_ctx,
-                                                       &hnd,
-                                                       i++,
-                                                       value_name,
-                                                       value_offered,
-                                                       &value_needed,
-                                                       &type,
-                                                       data,
-                                                       data_offered,
-                                                       &data_needed,
-                                                       &result);
-               if (NT_STATUS_IS_OK(status) && W_ERROR_IS_OK(result)) {
-                       struct regval_blob *v;
-
-                       v = regval_compose(talloc_tos(),
-                                          value_name,
-                                          type,
-                                          data,
-                                          data_offered);
-                       if (v == NULL) {
-                               result = WERR_NOMEM;
-                               goto done;
-                       }
+       r.in.data_offered       = *r.out.data_needed;
+       r.in.value_offered      = *r.out.value_needed;
+       r.out.data              = talloc_zero_array(mem_ctx, uint8_t, r.in.data_offered);
+       r.out.value_name        = talloc_zero_array(mem_ctx, char, r.in.value_offered);
 
-                       display_reg_value(v);
-                       talloc_free(v);
+       do {
+
+               status = dcerpc_spoolss_EnumPrinterData_r(b, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       result = ntstatus_to_werror(status);
+                       goto done;
                }
-       }
 
-       if (W_ERROR_V(result) == ERRnomoreitems) {
-               result = W_ERROR(ERRsuccess);
-       }
+               if (W_ERROR_EQUAL(r.out.result, WERR_NO_MORE_ITEMS)) {
+                       result = WERR_OK;
+                       break;
+               }
+
+               r.in.enum_index++;
+
+               display_reg_value(r.out.value_name, *r.out.type,
+                                 data_blob_const(r.out.data, r.in.data_offered));
+
+       } while (W_ERROR_IS_OK(r.out.result));
 
 done:
        if (is_valid_policy_hnd(&hnd)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &_result);
        }
 
        return result;
@@ -2972,6 +3071,7 @@ static WERROR cmd_spoolss_enum_data_ex( struct rpc_pipe_client *cli,
        struct policy_handle hnd;
        uint32_t count;
        struct spoolss_PrinterEnumValues *info;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 3) {
                printf("Usage: %s printername <keyname>\n", argv[0]);
@@ -3011,7 +3111,8 @@ static WERROR cmd_spoolss_enum_data_ex( struct rpc_pipe_client *cli,
 
  done:
        if (is_valid_policy_hnd(&hnd)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &_result);
        }
 
        return result;
@@ -3031,6 +3132,7 @@ static WERROR cmd_spoolss_enum_printerkey(struct rpc_pipe_client *cli,
        const char **key_buffer = NULL;
        int i;
        uint32_t offered = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2 || argc > 4) {
                printf("Usage: %s printername [keyname] [offered]\n", argv[0]);
@@ -3078,7 +3180,8 @@ static WERROR cmd_spoolss_enum_printerkey(struct rpc_pipe_client *cli,
  done:
 
        if (is_valid_policy_hnd(&hnd)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &_result);
        }
 
        return result;
@@ -3093,10 +3196,11 @@ static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli,
 {
        const char *printername;
        const char *clientname;
-       struct policy_handle hnd;
+       struct policy_handle hnd = { 0, };
        WERROR result;
        NTSTATUS status;
        struct spoolss_NotifyOption option;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 2) {
                printf("Usage: %s printername\n", argv[0]);
@@ -3146,7 +3250,7 @@ static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli,
        }
        option.types[1].fields[0].field = JOB_NOTIFY_FIELD_PRINTER_NAME;
 
-       clientname = talloc_asprintf(mem_ctx, "\\\\%s", global_myname());
+       clientname = talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name());
        if (!clientname) {
                result = WERR_NOMEM;
                goto done;
@@ -3154,7 +3258,7 @@ static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli,
 
        /* Send rffpcnex */
 
-       status = rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx(cli, mem_ctx,
+       status = dcerpc_spoolss_RemoteFindFirstPrinterChangeNotifyEx(b, mem_ctx,
                                                                     &hnd,
                                                                     0,
                                                                     0,
@@ -3162,14 +3266,20 @@ static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli,
                                                                     123,
                                                                     &option,
                                                                     &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (!W_ERROR_IS_OK(result)) {
                printf("Error rffpcnex %s\n", argv[1]);
                goto done;
        }
 
 done:
-       if (is_valid_policy_hnd(&hnd))
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &hnd, NULL);
+       if (is_valid_policy_hnd(&hnd)) {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &hnd, &_result);
+       }
 
        return result;
 }
@@ -3306,7 +3416,7 @@ static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli,
 
        /* first get the connection to the remote server */
 
-       nt_status = cli_full_connection(&cli_server2, global_myname(), argv[2],
+       nt_status = cli_full_connection(&cli_server2, lp_netbios_name(), argv[2],
                                        NULL, 0,
                                        "IPC$", "IPC",
                                        get_cmdline_auth_info_username(rpcclient_auth_info),
@@ -3366,8 +3476,11 @@ done:
        /* cleanup */
 
        printf("Closing printers...");
-       rpccli_spoolss_ClosePrinter( cli, mem_ctx, &hPrinter1, NULL );
-       rpccli_spoolss_ClosePrinter( cli2, mem_ctx, &hPrinter2, NULL );
+       {
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(cli->binding_handle, mem_ctx, &hPrinter1, &_result);
+               dcerpc_spoolss_ClosePrinter(cli2->binding_handle, mem_ctx, &hPrinter2, &_result);
+       }
        printf("ok\n");
 
        /* close the second remote connection */
@@ -3555,6 +3668,7 @@ static WERROR cmd_spoolss_create_printer_ic(struct rpc_pipe_client *cli,
        struct policy_handle handle, gdi_handle;
        const char *printername;
        struct spoolss_DevmodeContainer devmode_ctr;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        RPCCLIENT_PRINTERNAME(printername, cli, argv[1]);
 
@@ -3568,21 +3682,27 @@ static WERROR cmd_spoolss_create_printer_ic(struct rpc_pipe_client *cli,
 
        ZERO_STRUCT(devmode_ctr);
 
-       status = rpccli_spoolss_CreatePrinterIC(cli, mem_ctx,
+       status = dcerpc_spoolss_CreatePrinterIC(b, mem_ctx,
                                                &handle,
                                                &gdi_handle,
                                                &devmode_ctr,
                                                &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
        if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
  done:
        if (is_valid_policy_hnd(&gdi_handle)) {
-               rpccli_spoolss_DeletePrinterIC(cli, mem_ctx, &gdi_handle, NULL);
+               WERROR _result;
+               dcerpc_spoolss_DeletePrinterIC(b, mem_ctx, &gdi_handle, &_result);
        }
        if (is_valid_policy_hnd(&handle)) {
-               rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
+               WERROR _result;
+               dcerpc_spoolss_ClosePrinter(b, mem_ctx, &handle, &_result);
        }
 
        return result;
@@ -3593,42 +3713,42 @@ struct cmd_set spoolss_commands[] = {
 
        { "SPOOLSS"  },
 
-       { "adddriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver,   &ndr_table_spoolss.syntax_id, NULL, "Add a print driver",                  "" },
-       { "addprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex,       &ndr_table_spoolss.syntax_id, NULL, "Add a printer",                       "" },
-       { "deldriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver,       &ndr_table_spoolss.syntax_id, NULL, "Delete a printer driver",             "" },
-       { "deldriverex",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriverex,     &ndr_table_spoolss.syntax_id, NULL, "Delete a printer driver with files",  "" },
-       { "enumdata",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,          &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer data",              "" },
-       { "enumdataex",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex,       &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer data for a key",    "" },
-       { "enumkey",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey,    &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer keys",              "" },
-       { "enumjobs",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,          &ndr_table_spoolss.syntax_id, NULL, "Enumerate print jobs",                "" },
-       { "getjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_get_job,            &ndr_table_spoolss.syntax_id, NULL, "Get print job",                       "" },
-       { "setjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_set_job,            &ndr_table_spoolss.syntax_id, NULL, "Set print job",                       "" },
-       { "enumports",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,         &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer ports",             "" },
-       { "enumdrivers",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers,       &ndr_table_spoolss.syntax_id, NULL, "Enumerate installed printer drivers", "" },
-       { "enumprinters",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers,      &ndr_table_spoolss.syntax_id, NULL, "Enumerate printers",                  "" },
-       { "getdata",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata,     &ndr_table_spoolss.syntax_id, NULL, "Get print driver data",               "" },
-       { "getdataex",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdataex,   &ndr_table_spoolss.syntax_id, NULL, "Get printer driver data with keyname", ""},
-       { "getdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,          &ndr_table_spoolss.syntax_id, NULL, "Get print driver information",        "" },
-       { "getdriverdir",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir,       &ndr_table_spoolss.syntax_id, NULL, "Get print driver upload directory",   "" },
-       { "getprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,         &ndr_table_spoolss.syntax_id, NULL, "Get printer info",                    "" },
-       { "openprinter",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer,       &ndr_table_spoolss.syntax_id, NULL, "Open printer handle",                 "" },
-       { "openprinter_ex",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex,    &ndr_table_spoolss.syntax_id, NULL, "Open printer handle",                 "" },
-       { "setdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,          &ndr_table_spoolss.syntax_id, NULL, "Set printer driver",                  "" },
-       { "getprintprocdir",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    &ndr_table_spoolss.syntax_id, NULL, "Get print processor directory",       "" },
-       { "addform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,            &ndr_table_spoolss.syntax_id, NULL, "Add form",                            "" },
-       { "setform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,            &ndr_table_spoolss.syntax_id, NULL, "Set form",                            "" },
-       { "getform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,            &ndr_table_spoolss.syntax_id, NULL, "Get form",                            "" },
-       { "deleteform",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,         &ndr_table_spoolss.syntax_id, NULL, "Delete form",                         "" },
-       { "enumforms",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,         &ndr_table_spoolss.syntax_id, NULL, "Enumerate forms",                     "" },
-       { "setprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,         &ndr_table_spoolss.syntax_id, NULL, "Set printer comment",                 "" },
-       { "setprintername",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprintername,     &ndr_table_spoolss.syntax_id, NULL, "Set printername",                 "" },
-       { "setprinterdata",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata,     &ndr_table_spoolss.syntax_id, NULL, "Set REG_SZ printer data",             "" },
-       { "rffpcnex",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,           &ndr_table_spoolss.syntax_id, NULL, "Rffpcnex test", "" },
-       { "printercmp",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_printercmp,         &ndr_table_spoolss.syntax_id, NULL, "Printer comparison test", "" },
-       { "enumprocs",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_procs,         &ndr_table_spoolss.syntax_id, NULL, "Enumerate Print Processors",          "" },
-       { "enumprocdatatypes",  RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_proc_data_types, &ndr_table_spoolss.syntax_id, NULL, "Enumerate Print Processor Data Types", "" },
-       { "enummonitors",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_monitors,      &ndr_table_spoolss.syntax_id, NULL, "Enumerate Print Monitors", "" },
-       { "createprinteric",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_create_printer_ic,  &ndr_table_spoolss.syntax_id, NULL, "Create Printer IC", "" },
+       { "adddriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver,   &ndr_table_spoolss, NULL, "Add a print driver",                  "" },
+       { "addprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex,       &ndr_table_spoolss, NULL, "Add a printer",                       "" },
+       { "deldriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver,       &ndr_table_spoolss, NULL, "Delete a printer driver",             "" },
+       { "deldriverex",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriverex,     &ndr_table_spoolss, NULL, "Delete a printer driver with files",  "" },
+       { "enumdata",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,          &ndr_table_spoolss, NULL, "Enumerate printer data",              "" },
+       { "enumdataex",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex,       &ndr_table_spoolss, NULL, "Enumerate printer data for a key",    "" },
+       { "enumkey",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey,    &ndr_table_spoolss, NULL, "Enumerate printer keys",              "" },
+       { "enumjobs",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,          &ndr_table_spoolss, NULL, "Enumerate print jobs",                "" },
+       { "getjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_get_job,            &ndr_table_spoolss, NULL, "Get print job",                       "" },
+       { "setjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_set_job,            &ndr_table_spoolss, NULL, "Set print job",                       "" },
+       { "enumports",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,         &ndr_table_spoolss, NULL, "Enumerate printer ports",             "" },
+       { "enumdrivers",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers,       &ndr_table_spoolss, NULL, "Enumerate installed printer drivers", "" },
+       { "enumprinters",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers,      &ndr_table_spoolss, NULL, "Enumerate printers",                  "" },
+       { "getdata",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata,     &ndr_table_spoolss, NULL, "Get print driver data",               "" },
+       { "getdataex",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdataex,   &ndr_table_spoolss, NULL, "Get printer driver data with keyname", ""},
+       { "getdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,          &ndr_table_spoolss, NULL, "Get print driver information",        "" },
+       { "getdriverdir",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir,       &ndr_table_spoolss, NULL, "Get print driver upload directory",   "" },
+       { "getprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,         &ndr_table_spoolss, NULL, "Get printer info",                    "" },
+       { "openprinter",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer,       &ndr_table_spoolss, NULL, "Open printer handle",                 "" },
+       { "openprinter_ex",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex,    &ndr_table_spoolss, NULL, "Open printer handle",                 "" },
+       { "setdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,          &ndr_table_spoolss, NULL, "Set printer driver",                  "" },
+       { "getprintprocdir",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    &ndr_table_spoolss, NULL, "Get print processor directory",       "" },
+       { "addform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,            &ndr_table_spoolss, NULL, "Add form",                            "" },
+       { "setform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,            &ndr_table_spoolss, NULL, "Set form",                            "" },
+       { "getform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,            &ndr_table_spoolss, NULL, "Get form",                            "" },
+       { "deleteform",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,         &ndr_table_spoolss, NULL, "Delete form",                         "" },
+       { "enumforms",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,         &ndr_table_spoolss, NULL, "Enumerate forms",                     "" },
+       { "setprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,         &ndr_table_spoolss, NULL, "Set printer comment",                 "" },
+       { "setprintername",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprintername,     &ndr_table_spoolss, NULL, "Set printername",                 "" },
+       { "setprinterdata",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata,     &ndr_table_spoolss, NULL, "Set REG_SZ printer data",             "" },
+       { "rffpcnex",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,           &ndr_table_spoolss, NULL, "Rffpcnex test", "" },
+       { "printercmp",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_printercmp,         &ndr_table_spoolss, NULL, "Printer comparison test", "" },
+       { "enumprocs",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_procs,         &ndr_table_spoolss, NULL, "Enumerate Print Processors",          "" },
+       { "enumprocdatatypes",  RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_proc_data_types, &ndr_table_spoolss, NULL, "Enumerate Print Processor Data Types", "" },
+       { "enummonitors",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_monitors,      &ndr_table_spoolss, NULL, "Enumerate Print Monitors", "" },
+       { "createprinteric",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_create_printer_ic,  &ndr_table_spoolss, NULL, "Create Printer IC", "" },
 
        { NULL }
 };