s4-smbtorture: enhance spoolss_EnumPrinterKey torture test.
[ira/wip.git] / source4 / torture / rpc / spoolss.c
index 707f3496b67f171610a95e8b81f840276d02f6bb..7468278e08e2f93704934e1b9cc2406a4baebe68 100644 (file)
@@ -1,21 +1,22 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    test suite for spoolss rpc operations
 
    Copyright (C) Tim Potter 2003
    Copyright (C) Stefan Metzmacher 2005
    Copyright (C) Jelmer Vernooij 2007
-   
+   Copyright (C) Guenther Deschner 2009
+
    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 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
 #include "torture/torture.h"
 #include "torture/rpc/rpc.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
+#include "param/param.h"
+
+#define TORTURE_WELLKNOWN_PRINTER      "torture_wkn_printer"
+#define TORTURE_PRINTER                        "torture_printer"
+#define TORTURE_WELLKNOWN_PRINTER_EX   "torture_wkn_printer_ex"
+#define TORTURE_PRINTER_EX             "torture_printer_ex"
 
 struct test_spoolss_context {
        /* print server handle */
@@ -34,8 +42,8 @@ struct test_spoolss_context {
        union spoolss_PortInfo *ports[3];
 
        /* for EnumPrinterDrivers */
-       uint32_t driver_count[7];
-       union spoolss_DriverInfo *drivers[7];
+       uint32_t driver_count[8];
+       union spoolss_DriverInfo *drivers[8];
 
        /* for EnumMonitors */
        uint32_t monitor_count[3];
@@ -72,30 +80,57 @@ struct test_spoolss_context {
        torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
 } while(0)
 
-#define COMPARE_STRING_ARRAY(tctx, c,r,e)
+#define COMPARE_UINT64(tctx, c, r, e) do {\
+       _CHECK_FIELD_SIZE(c, r, e, uint64_t); \
+       torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
+} while(0)
+
+
+#define COMPARE_NTTIME(tctx, c, r, e) do {\
+       _CHECK_FIELD_SIZE(c, r, e, NTTIME); \
+       torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
+} while(0)
+
+#define COMPARE_STRING_ARRAY(tctx, c,r,e) do {\
+       int __i; \
+       if (!c.e && !r.e) { \
+               break; \
+       } \
+       if (c.e && !r.e) { \
+               torture_fail(tctx, #r "." #e " field is NULL and " #c "." #e " is not\n"); \
+       } \
+       if (!c.e && r.e) { \
+               torture_fail(tctx, #c "." #e " field is NULL and " #r "." #e " is not\n"); \
+       } \
+       for (__i=0;c.e[__i] != NULL; __i++) { \
+               torture_assert_str_equal(tctx, c.e[__i], r.e[__i], "invalid value"); \
+       } \
+} while(0)
 
-static bool test_OpenPrinter_server(struct torture_context *tctx, struct dcerpc_pipe *p, struct test_spoolss_context *ctx)
+static bool test_OpenPrinter_server(struct torture_context *tctx,
+                                   struct dcerpc_pipe *p,
+                                   struct policy_handle *server_handle)
 {
        NTSTATUS status;
        struct spoolss_OpenPrinter op;
 
-       op.in.printername       = talloc_asprintf(ctx, "\\\\%s", dcerpc_server_name(p));
+       op.in.printername       = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        op.in.datatype          = NULL;
        op.in.devmode_ctr.devmode= NULL;
        op.in.access_mask       = 0;
-       op.out.handle           = &ctx->server_handle;
+       op.out.handle           = server_handle;
 
        torture_comment(tctx, "Testing OpenPrinter(%s)\n", op.in.printername);
 
-       status = dcerpc_spoolss_OpenPrinter(p, ctx, &op);
+       status = dcerpc_spoolss_OpenPrinter(p, tctx, &op);
        torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_OpenPrinter failed");
-       torture_assert_werr_ok(tctx, op.out.result, "dcerpc_spoolss_OpenPrinter failed"); 
+       torture_assert_werr_ok(tctx, op.out.result, "dcerpc_spoolss_OpenPrinter failed");
 
        return true;
 }
 
-static bool test_EnumPorts(struct torture_context *tctx, 
-                          struct dcerpc_pipe *p, 
+static bool test_EnumPorts(struct torture_context *tctx,
+                          struct dcerpc_pipe *p,
                           struct test_spoolss_context *ctx)
 {
        NTSTATUS status;
@@ -106,11 +141,17 @@ static bool test_EnumPorts(struct torture_context *tctx,
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                DATA_BLOB blob;
+               uint32_t needed;
+               uint32_t count;
+               union spoolss_PortInfo *info;
 
                r.in.servername = "";
                r.in.level = level;
                r.in.buffer = NULL;
                r.in.offered = 0;
+               r.out.needed = &needed;
+               r.out.count = &count;
+               r.out.info = &info;
 
                torture_comment(tctx, "Testing EnumPorts level %u\n", r.in.level);
 
@@ -120,27 +161,29 @@ static bool test_EnumPorts(struct torture_context *tctx,
                        /* TODO: do some more checks here */
                        continue;
                }
-               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, 
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "EnumPorts unexpected return code");
 
-               blob = data_blob_talloc(ctx, NULL, r.out.needed);
+               blob = data_blob_talloc(ctx, NULL, needed);
                data_blob_clear(&blob);
                r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
 
                status = dcerpc_spoolss_EnumPorts(p, ctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPorts failed");
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPorts failed");
 
-               ctx->port_count[level]  = r.out.count;
-               ctx->ports[level]       = r.out.info;
+               torture_assert(tctx, info, "EnumPorts returned no info");
+
+               ctx->port_count[level]  = count;
+               ctx->ports[level]       = info;
        }
 
        for (i=1;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                int old_level = levels[i-1];
-               torture_assert_int_equal(tctx, ctx->port_count[level], ctx->port_count[old_level], 
+               torture_assert_int_equal(tctx, ctx->port_count[level], ctx->port_count[old_level],
                        "EnumPorts invalid value");
        }
        /* if the array sizes are not the same we would maybe segfault in the following code */
@@ -164,8 +207,71 @@ static bool test_EnumPorts(struct torture_context *tctx,
        return true;
 }
 
-static bool test_GetPrinterDriverDirectory(struct torture_context *tctx, 
-                                          struct dcerpc_pipe *p, 
+static bool test_GetPrintProcessorDirectory(struct torture_context *tctx,
+                                           struct dcerpc_pipe *p,
+                                           struct test_spoolss_context *ctx)
+{
+       NTSTATUS status;
+       struct spoolss_GetPrintProcessorDirectory r;
+       struct {
+               uint16_t level;
+               const char *server;
+       } levels[] = {{
+                       .level  = 1,
+                       .server = NULL
+               },{
+                       .level  = 1,
+                       .server = ""
+               },{
+                       .level  = 78,
+                       .server = ""
+               },{
+                       .level  = 1,
+                       .server = talloc_asprintf(ctx, "\\\\%s", dcerpc_server_name(p))
+               },{
+                       .level  = 1024,
+                       .server = talloc_asprintf(ctx, "\\\\%s", dcerpc_server_name(p))
+               }
+       };
+       int i;
+       uint32_t needed;
+
+       for (i=0;i<ARRAY_SIZE(levels);i++) {
+               int level = levels[i].level;
+               DATA_BLOB blob;
+
+               r.in.server             = levels[i].server;
+               r.in.environment        = SPOOLSS_ARCHITECTURE_NT_X86;
+               r.in.level              = level;
+               r.in.buffer             = NULL;
+               r.in.offered            = 0;
+               r.out.needed            = &needed;
+
+               torture_comment(tctx, "Testing GetPrintProcessorDirectory level %u\n", r.in.level);
+
+               status = dcerpc_spoolss_GetPrintProcessorDirectory(p, ctx, &r);
+               torture_assert_ntstatus_ok(tctx, status,
+                       "dcerpc_spoolss_GetPrintProcessorDirectory failed");
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
+                       "GetPrintProcessorDirectory unexpected return code");
+
+               blob = data_blob_talloc(ctx, NULL, needed);
+               data_blob_clear(&blob);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+
+               status = dcerpc_spoolss_GetPrintProcessorDirectory(p, ctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_GetPrintProcessorDirectory failed");
+
+               torture_assert_werr_ok(tctx, r.out.result, "GetPrintProcessorDirectory failed");
+       }
+
+       return true;
+}
+
+
+static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
+                                          struct dcerpc_pipe *p,
                                           struct test_spoolss_context *ctx)
 {
        NTSTATUS status;
@@ -207,9 +313,9 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
                torture_comment(tctx, "Testing GetPrinterDriverDirectory level %u\n", r.in.level);
 
                status = dcerpc_spoolss_GetPrinterDriverDirectory(p, ctx, &r);
-               torture_assert_ntstatus_ok(tctx, status, 
+               torture_assert_ntstatus_ok(tctx, status,
                        "dcerpc_spoolss_GetPrinterDriverDirectory failed");
-               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, 
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "GetPrinterDriverDirectory unexpected return code");
 
                blob = data_blob_talloc(ctx, NULL, needed);
@@ -226,113 +332,145 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
        return true;
 }
 
-static bool test_EnumPrinterDrivers(struct torture_context *tctx, 
+static bool test_EnumPrinterDrivers(struct torture_context *tctx,
                                    struct dcerpc_pipe *p,
-                                   struct test_spoolss_context *ctx)
+                                   struct test_spoolss_context *ctx,
+                                   const char *architecture)
 {
        NTSTATUS status;
        struct spoolss_EnumPrinterDrivers r;
-       uint16_t levels[] = { 1, 2, 3, 4, 5, 6 };
+       uint16_t levels[] = { 1, 2, 3, 4, 5, 6, 8 };
        int i, j;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                DATA_BLOB blob;
+               uint32_t needed;
+               uint32_t count;
+               union spoolss_DriverInfo *info;
 
-               r.in.server             = "";
-               r.in.environment        = SPOOLSS_ARCHITECTURE_NT_X86;
+               /* FIXME: gd, come back and fix "" as server, and handle
+                * priority of returned error codes in torture test and samba 3
+                * server */
+
+               r.in.server             = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+               r.in.environment        = architecture;
                r.in.level              = level;
                r.in.buffer             = NULL;
                r.in.offered            = 0;
+               r.out.needed            = &needed;
+               r.out.count             = &count;
+               r.out.info              = &info;
 
-               torture_comment(tctx, "Testing EnumPrinterDrivers level %u\n", r.in.level);
+               torture_comment(tctx, "Testing EnumPrinterDrivers level %u (%s)\n", r.in.level, r.in.environment);
 
                status = dcerpc_spoolss_EnumPrinterDrivers(p, ctx, &r);
-               torture_assert_ntstatus_ok(tctx, status, 
+               torture_assert_ntstatus_ok(tctx, status,
                                           "dcerpc_spoolss_EnumPrinterDrivers failed");
                if (W_ERROR_IS_OK(r.out.result)) {
                        /* TODO: do some more checks here */
                        continue;
                }
-               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, 
-                       "EnumPrinterDrivers failed");
-
-               blob = data_blob_talloc(ctx, NULL, r.out.needed);
-               data_blob_clear(&blob);
-               r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+                       blob = data_blob_talloc(ctx, NULL, needed);
+                       data_blob_clear(&blob);
+                       r.in.buffer = &blob;
+                       r.in.offered = needed;
 
-               status = dcerpc_spoolss_EnumPrinterDrivers(p, ctx, &r);
-               torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrinterDrivers failed");
+                       status = dcerpc_spoolss_EnumPrinterDrivers(p, ctx, &r);
+                       torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrinterDrivers failed");
+               }
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDrivers failed");
 
-               ctx->driver_count[level]        = r.out.count;
-               ctx->drivers[level]             = r.out.info;
+               ctx->driver_count[level]        = count;
+               ctx->drivers[level]             = info;
        }
 
        for (i=1;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                int old_level = levels[i-1];
+
                torture_assert_int_equal(tctx, ctx->driver_count[level], ctx->driver_count[old_level],
                        "EnumPrinterDrivers invalid value");
        }
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
+
                for (j=0;j<ctx->driver_count[level];j++) {
                        union spoolss_DriverInfo *cur = &ctx->drivers[level][j];
-                       union spoolss_DriverInfo *ref = &ctx->drivers[6][j];
+                       union spoolss_DriverInfo *ref = &ctx->drivers[8][j];
+
                        switch (level) {
                        case 1:
-                               COMPARE_STRING(tctx, cur->info1, ref->info6, driver_name);
+                               COMPARE_STRING(tctx, cur->info1, ref->info8, driver_name);
                                break;
                        case 2:
-                               COMPARE_UINT32(tctx, cur->info2, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, config_file);
+                               COMPARE_UINT32(tctx, cur->info2, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, config_file);
                                break;
                        case 3:
-                               COMPARE_UINT32(tctx, cur->info3, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, config_file);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, help_file);
-                               COMPARE_STRING_ARRAY(tctx, cur->info3, ref->info6, dependent_files);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, monitor_name);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, default_datatype);
+                               COMPARE_UINT32(tctx, cur->info3, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, config_file);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, help_file);
+                               COMPARE_STRING_ARRAY(tctx, cur->info3, ref->info8, dependent_files);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, monitor_name);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, default_datatype);
                                break;
                        case 4:
-                               COMPARE_UINT32(tctx, cur->info4, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, config_file);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, help_file);
-                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info6, dependent_files);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, monitor_name);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, default_datatype);
-                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info6, previous_names);
+                               COMPARE_UINT32(tctx, cur->info4, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, config_file);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, help_file);
+                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info8, dependent_files);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, monitor_name);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, default_datatype);
+                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info8, previous_names);
                                break;
                        case 5:
-                               COMPARE_UINT32(tctx, cur->info5, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, config_file);
-                               /*COMPARE_UINT32(tctx, cur->info5, ref->info6, driver_attributes);*/
-                               /*COMPARE_UINT32(tctx, cur->info5, ref->info6, config_version);*/
-                               /*TODO: ! COMPARE_UINT32(tctx, cur->info5, ref->info6, driver_version); */
+                               COMPARE_UINT32(tctx, cur->info5, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, config_file);
+                               /*COMPARE_UINT32(tctx, cur->info5, ref->info8, driver_attributes);*/
+                               /*COMPARE_UINT32(tctx, cur->info5, ref->info8, config_version);*/
+                               /*TODO: ! COMPARE_UINT32(tctx, cur->info5, ref->info8, driver_version); */
                                break;
                        case 6:
-                               /* level 6 is our reference, and it makes no sense to compare it to itself */
+                               COMPARE_UINT32(tctx, cur->info6, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, config_file);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, help_file);
+                               COMPARE_STRING_ARRAY(tctx, cur->info6, ref->info8, dependent_files);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, monitor_name);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, default_datatype);
+                               COMPARE_STRING_ARRAY(tctx, cur->info6, ref->info8, previous_names);
+                               COMPARE_NTTIME(tctx, cur->info6, ref->info8, driver_date);
+                               COMPARE_UINT64(tctx, cur->info6, ref->info8, driver_version);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, manufacturer_name);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, manufacturer_url);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, hardware_id);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, provider);
+                               break;
+                       case 8:
+                               /* level 8 is our reference, and it makes no sense to compare it to itself */
                                break;
                        }
                }
@@ -341,8 +479,8 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx,
        return true;
 }
 
-static bool test_EnumMonitors(struct torture_context *tctx, 
-                             struct dcerpc_pipe *p, 
+static bool test_EnumMonitors(struct torture_context *tctx,
+                             struct dcerpc_pipe *p,
                              struct test_spoolss_context *ctx)
 {
        NTSTATUS status;
@@ -353,11 +491,17 @@ static bool test_EnumMonitors(struct torture_context *tctx,
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                DATA_BLOB blob;
+               uint32_t needed;
+               uint32_t count;
+               union spoolss_MonitorInfo *info;
 
                r.in.servername = "";
                r.in.level = level;
                r.in.buffer = NULL;
                r.in.offered = 0;
+               r.out.needed = &needed;
+               r.out.count = &count;
+               r.out.info = &info;
 
                torture_comment(tctx, "Testing EnumMonitors level %u\n", r.in.level);
 
@@ -367,27 +511,27 @@ static bool test_EnumMonitors(struct torture_context *tctx,
                        /* TODO: do some more checks here */
                        continue;
                }
-               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, 
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "EnumMonitors failed");
 
-               blob = data_blob_talloc(ctx, NULL, r.out.needed);
+               blob = data_blob_talloc(ctx, NULL, needed);
                data_blob_clear(&blob);
                r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
 
                status = dcerpc_spoolss_EnumMonitors(p, ctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumMonitors failed");
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumMonitors failed");
 
-               ctx->monitor_count[level]       = r.out.count;
-               ctx->monitors[level]            = r.out.info;
+               ctx->monitor_count[level]       = count;
+               ctx->monitors[level]            = info;
        }
 
        for (i=1;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                int old_level = levels[i-1];
-               torture_assert_int_equal(tctx, ctx->monitor_count[level], ctx->monitor_count[old_level], 
+               torture_assert_int_equal(tctx, ctx->monitor_count[level], ctx->monitor_count[old_level],
                                         "EnumMonitors invalid value");
        }
 
@@ -410,7 +554,7 @@ static bool test_EnumMonitors(struct torture_context *tctx,
        return true;
 }
 
-static bool test_EnumPrintProcessors(struct torture_context *tctx, 
+static bool test_EnumPrintProcessors(struct torture_context *tctx,
                                     struct dcerpc_pipe *p,
                                     struct test_spoolss_context *ctx)
 {
@@ -422,12 +566,18 @@ static bool test_EnumPrintProcessors(struct torture_context *tctx,
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                DATA_BLOB blob;
+               uint32_t needed;
+               uint32_t count;
+               union spoolss_PrintProcessorInfo *info;
 
                r.in.servername = "";
-               r.in.environment = "Windows NT x86";
+               r.in.environment = SPOOLSS_ARCHITECTURE_NT_X86;
                r.in.level = level;
                r.in.buffer = NULL;
                r.in.offered = 0;
+               r.out.needed = &needed;
+               r.out.count = &count;
+               r.out.info = &info;
 
                torture_comment(tctx, "Testing EnumPrintProcessors level %u\n", r.in.level);
 
@@ -437,21 +587,21 @@ static bool test_EnumPrintProcessors(struct torture_context *tctx,
                        /* TODO: do some more checks here */
                        continue;
                }
-               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, 
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "EnumPrintProcessors unexpected return code");
 
-               blob = data_blob_talloc(ctx, NULL, r.out.needed);
+               blob = data_blob_talloc(ctx, NULL, needed);
                data_blob_clear(&blob);
                r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
 
                status = dcerpc_spoolss_EnumPrintProcessors(p, ctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcessors failed");
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcessors failed");
 
-               ctx->print_processor_count[level]       = r.out.count;
-               ctx->print_processors[level]            = r.out.info;
+               ctx->print_processor_count[level]       = count;
+               ctx->print_processors[level]            = info;
        }
 
        for (i=1;i<ARRAY_SIZE(levels);i++) {
@@ -479,7 +629,58 @@ static bool test_EnumPrintProcessors(struct torture_context *tctx,
        return true;
 }
 
-static bool test_EnumPrinters(struct torture_context *tctx, 
+static bool test_EnumPrintProcDataTypes(struct torture_context *tctx,
+                                       struct dcerpc_pipe *p,
+                                       struct test_spoolss_context *ctx)
+{
+       NTSTATUS status;
+       struct spoolss_EnumPrintProcDataTypes r;
+       uint16_t levels[] = { 1 };
+       int i;
+
+       for (i=0;i<ARRAY_SIZE(levels);i++) {
+               int level = levels[i];
+               DATA_BLOB blob;
+               uint32_t needed;
+               uint32_t count;
+               union spoolss_PrintProcDataTypesInfo *info;
+
+               r.in.servername = "";
+               r.in.print_processor_name = "winprint";
+               r.in.level = level;
+               r.in.buffer = NULL;
+               r.in.offered = 0;
+               r.out.needed = &needed;
+               r.out.count = &count;
+               r.out.info = &info;
+
+               torture_comment(tctx, "Testing EnumPrintProcDataTypes level %u\n", r.in.level);
+
+               status = dcerpc_spoolss_EnumPrintProcDataTypes(p, ctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcDataType failed");
+               if (W_ERROR_IS_OK(r.out.result)) {
+                       /* TODO: do some more checks here */
+                       continue;
+               }
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
+                       "EnumPrintProcDataTypes unexpected return code");
+
+               blob = data_blob_talloc(ctx, NULL, needed);
+               data_blob_clear(&blob);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+
+               status = dcerpc_spoolss_EnumPrintProcDataTypes(p, ctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcDataTypes failed");
+
+               torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcDataTypes failed");
+       }
+
+       return true;
+}
+
+
+static bool test_EnumPrinters(struct torture_context *tctx,
                              struct dcerpc_pipe *p,
                              struct test_spoolss_context *ctx)
 {
@@ -491,12 +692,18 @@ static bool test_EnumPrinters(struct torture_context *tctx,
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                int level = levels[i];
                DATA_BLOB blob;
+               uint32_t needed;
+               uint32_t count;
+               union spoolss_PrinterInfo *info;
 
                r.in.flags      = PRINTER_ENUM_LOCAL;
                r.in.server     = "";
                r.in.level      = level;
                r.in.buffer     = NULL;
                r.in.offered    = 0;
+               r.out.needed    = &needed;
+               r.out.count     = &count;
+               r.out.info      = &info;
 
                torture_comment(tctx, "Testing EnumPrinters level %u\n", r.in.level);
 
@@ -506,21 +713,21 @@ static bool test_EnumPrinters(struct torture_context *tctx,
                        /* TODO: do some more checks here */
                        continue;
                }
-               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, 
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "EnumPrinters unexpected return code");
 
-               blob = data_blob_talloc(ctx, NULL, r.out.needed);
+               blob = data_blob_talloc(ctx, NULL, needed);
                data_blob_clear(&blob);
                r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
 
                status = dcerpc_spoolss_EnumPrinters(p, ctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrinters failed");
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrinters failed");
 
-               ctx->printer_count[level]       = r.out.count;
-               ctx->printers[level]            = r.out.info;
+               ctx->printer_count[level]       = count;
+               ctx->printers[level]            = info;
        }
 
        for (i=1;i<ARRAY_SIZE(levels);i++) {
@@ -542,7 +749,7 @@ static bool test_EnumPrinters(struct torture_context *tctx,
                                COMPARE_UINT32(tctx, cur->info0, ref->info2, cjobs);
                                /*COMPARE_UINT32(tctx, cur->info0, ref->info2, total_jobs);
                                COMPARE_UINT32(tctx, cur->info0, ref->info2, total_bytes);
-                               COMPARE_SPOOLSS_TIME(cur->info0, ref->info2, spoolss_Time time);                
+                               COMPARE_SPOOLSS_TIME(cur->info0, ref->info2, spoolss_Time time);
                                COMPARE_UINT32(tctx, cur->info0, ref->info2, global_counter);
                                COMPARE_UINT32(tctx, cur->info0, ref->info2, total_pages);
                                COMPARE_UINT32(tctx, cur->info0, ref->info2, version);
@@ -599,8 +806,8 @@ static bool test_EnumPrinters(struct torture_context *tctx,
        return true;
 }
 
-static bool test_GetPrinter(struct torture_context *tctx, 
-                           struct dcerpc_pipe *p, 
+static bool test_GetPrinter(struct torture_context *tctx,
+                           struct dcerpc_pipe *p,
                     struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -608,7 +815,7 @@ static bool test_GetPrinter(struct torture_context *tctx,
        uint16_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
        int i;
        uint32_t needed;
-       
+
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                r.in.handle = handle;
                r.in.level = levels[i];
@@ -620,7 +827,7 @@ static bool test_GetPrinter(struct torture_context *tctx,
 
                status = dcerpc_spoolss_GetPrinter(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "GetPrinter failed");
-               
+
                if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
                        DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
                        data_blob_clear(&blob);
@@ -628,7 +835,7 @@ static bool test_GetPrinter(struct torture_context *tctx,
                        r.in.offered = needed;
                        status = dcerpc_spoolss_GetPrinter(p, tctx, &r);
                }
-               
+
                torture_assert_ntstatus_ok(tctx, status, "GetPrinter failed");
 
                torture_assert_werr_ok(tctx, r.out.result, "GetPrinter failed");
@@ -637,9 +844,567 @@ static bool test_GetPrinter(struct torture_context *tctx,
        return true;
 }
 
+static bool test_SetPrinter_errors(struct torture_context *tctx,
+                                  struct dcerpc_pipe *p,
+                                  struct policy_handle *handle)
+{
+       struct spoolss_SetPrinter r;
+       uint16_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+       int i;
+
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+
+       info_ctr.level = 0;
+       info_ctr.info.info0 = NULL;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+
+       r.in.handle = handle;
+       r.in.info_ctr = &info_ctr;
+       r.in.devmode_ctr = &devmode_ctr;
+       r.in.secdesc_ctr = &secdesc_ctr;
+       r.in.command = 0;
+
+       torture_comment(tctx, "Testing SetPrinter all zero\n");
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx, &r),
+               "failed to call SetPrinter");
+       torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM,
+               "failed to call SetPrinter");
+
+ again:
+       for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+               struct spoolss_SetPrinterInfo0 info0;
+               struct spoolss_SetPrinterInfo1 info1;
+               struct spoolss_SetPrinterInfo2 info2;
+               struct spoolss_SetPrinterInfo3 info3;
+               struct spoolss_SetPrinterInfo4 info4;
+               struct spoolss_SetPrinterInfo5 info5;
+               struct spoolss_SetPrinterInfo6 info6;
+               struct spoolss_SetPrinterInfo7 info7;
+               struct spoolss_DeviceModeInfo info8;
+               struct spoolss_DeviceModeInfo info9;
+
+
+               info_ctr.level = levels[i];
+               switch (levels[i]) {
+               case 0:
+                       ZERO_STRUCT(info0);
+                       info_ctr.info.info0 = &info0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(info1);
+                       info_ctr.info.info1 = &info1;
+                       break;
+               case 2:
+                       ZERO_STRUCT(info2);
+                       info_ctr.info.info2 = &info2;
+                       break;
+               case 3:
+                       ZERO_STRUCT(info3);
+                       info_ctr.info.info3 = &info3;
+                       break;
+               case 4:
+                       ZERO_STRUCT(info4);
+                       info_ctr.info.info4 = &info4;
+                       break;
+               case 5:
+                       ZERO_STRUCT(info5);
+                       info_ctr.info.info5 = &info5;
+                       break;
+               case 6:
+                       ZERO_STRUCT(info6);
+                       info_ctr.info.info6 = &info6;
+                       break;
+               case 7:
+                       ZERO_STRUCT(info7);
+                       info_ctr.info.info7 = &info7;
+                       break;
+               case 8:
+                       ZERO_STRUCT(info8);
+                       info_ctr.info.info8 = &info8;
+                       break;
+               case 9:
+                       ZERO_STRUCT(info9);
+                       info_ctr.info.info9 = &info9;
+                       break;
+               }
+
+               torture_comment(tctx, "Testing SetPrinter level %d, command %d\n",
+                       info_ctr.level, r.in.command);
+
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx, &r),
+                       "failed to call SetPrinter");
+
+               switch (r.in.command) {
+               case SPOOLSS_PRINTER_CONTROL_UNPAUSE: /* 0 */
+                       /* is ignored for all levels other then 0 */
+                       if (info_ctr.level > 0) {
+                               /* ignored then */
+                               break;
+                       }
+               case SPOOLSS_PRINTER_CONTROL_PAUSE: /* 1 */
+               case SPOOLSS_PRINTER_CONTROL_RESUME: /* 2 */
+               case SPOOLSS_PRINTER_CONTROL_PURGE: /* 3 */
+                       if (info_ctr.level > 0) {
+                               /* is invalid for all levels other then 0 */
+                               torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PRINTER_COMMAND,
+                                       "unexpected error code returned");
+                               continue;
+                       } else {
+                               torture_assert_werr_ok(tctx, r.out.result,
+                                       "failed to call SetPrinter with non 0 command");
+                               continue;
+                       }
+                       break;
+
+               case SPOOLSS_PRINTER_CONTROL_SET_STATUS: /* 4 */
+                       /* FIXME: gd needs further investigation */
+               default:
+                       torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PRINTER_COMMAND,
+                               "unexpected error code returned");
+                       continue;
+               }
+
+               switch (info_ctr.level) {
+               case 1:
+                       torture_assert_werr_equal(tctx, r.out.result, WERR_UNKNOWN_LEVEL,
+                               "unexpected error code returned");
+                       break;
+               case 2:
+                       torture_assert_werr_equal(tctx, r.out.result, WERR_UNKNOWN_PRINTER_DRIVER,
+                               "unexpected error code returned");
+                       break;
+               case 3:
+               case 4:
+               case 5:
+               case 7:
+                       torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM,
+                               "unexpected error code returned");
+                       break;
+               case 9:
+                       torture_assert_werr_equal(tctx, r.out.result, WERR_NOT_SUPPORTED,
+                               "unexpected error code returned");
+                       break;
+               default:
+                       torture_assert_werr_ok(tctx, r.out.result,
+                               "failed to call SetPrinter");
+                       break;
+               }
+       }
+
+       if (r.in.command < 5) {
+               r.in.command++;
+               goto again;
+       }
+
+       return true;
+}
+
+static void clear_info2(struct spoolss_SetPrinterInfoCtr *r)
+{
+       if ((r->level == 2) && (r->info.info2)) {
+               r->info.info2->secdesc = NULL;
+               r->info.info2->devmode = NULL;
+       }
+}
+
+static bool test_PrinterInfo(struct torture_context *tctx,
+                            struct dcerpc_pipe *p,
+                            struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct spoolss_SetPrinter s;
+       struct spoolss_GetPrinter q;
+       struct spoolss_GetPrinter q0;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       union spoolss_PrinterInfo info;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+       uint32_t needed;
+       bool ret = true;
+       int i;
+
+       uint32_t status_list[] = {
+               /* these do not stick
+               PRINTER_STATUS_PAUSED,
+               PRINTER_STATUS_ERROR,
+               PRINTER_STATUS_PENDING_DELETION, */
+               PRINTER_STATUS_PAPER_JAM,
+               PRINTER_STATUS_PAPER_OUT,
+               PRINTER_STATUS_MANUAL_FEED,
+               PRINTER_STATUS_PAPER_PROBLEM,
+               PRINTER_STATUS_OFFLINE,
+               PRINTER_STATUS_IO_ACTIVE,
+               PRINTER_STATUS_BUSY,
+               PRINTER_STATUS_PRINTING,
+               PRINTER_STATUS_OUTPUT_BIN_FULL,
+               PRINTER_STATUS_NOT_AVAILABLE,
+               PRINTER_STATUS_WAITING,
+               PRINTER_STATUS_PROCESSING,
+               PRINTER_STATUS_INITIALIZING,
+               PRINTER_STATUS_WARMING_UP,
+               PRINTER_STATUS_TONER_LOW,
+               PRINTER_STATUS_NO_TONER,
+               PRINTER_STATUS_PAGE_PUNT,
+               PRINTER_STATUS_USER_INTERVENTION,
+               PRINTER_STATUS_OUT_OF_MEMORY,
+               PRINTER_STATUS_DOOR_OPEN,
+               PRINTER_STATUS_SERVER_UNKNOWN,
+               PRINTER_STATUS_POWER_SAVE,
+               /* these do not stick
+               0x02000000,
+               0x04000000,
+               0x08000000,
+               0x10000000,
+               0x20000000,
+               0x40000000,
+               0x80000000 */
+       };
+       uint32_t default_attribute = PRINTER_ATTRIBUTE_LOCAL;
+       uint32_t attribute_list[] = {
+               PRINTER_ATTRIBUTE_QUEUED,
+               /* fails with WERR_INVALID_DATATYPE:
+               PRINTER_ATTRIBUTE_DIRECT, */
+               /* does not stick
+               PRINTER_ATTRIBUTE_DEFAULT, */
+               PRINTER_ATTRIBUTE_SHARED,
+               /* does not stick
+               PRINTER_ATTRIBUTE_NETWORK, */
+               PRINTER_ATTRIBUTE_HIDDEN,
+               PRINTER_ATTRIBUTE_LOCAL,
+               PRINTER_ATTRIBUTE_ENABLE_DEVQ,
+               PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS,
+               PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST,
+               PRINTER_ATTRIBUTE_WORK_OFFLINE,
+               /* does not stick
+               PRINTER_ATTRIBUTE_ENABLE_BIDI, */
+               /* fails with WERR_INVALID_DATATYPE:
+               PRINTER_ATTRIBUTE_RAW_ONLY, */
+               /* these do not stick
+               PRINTER_ATTRIBUTE_PUBLISHED,
+               PRINTER_ATTRIBUTE_FAX,
+               PRINTER_ATTRIBUTE_TS,
+               0x00010000,
+               0x00020000,
+               0x00040000,
+               0x00080000,
+               0x00100000,
+               0x00200000,
+               0x00400000,
+               0x00800000,
+               0x01000000,
+               0x02000000,
+               0x04000000,
+               0x08000000,
+               0x10000000,
+               0x20000000,
+               0x40000000,
+               0x80000000 */
+       };
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+
+       s.in.handle = handle;
+       s.in.command = 0;
+       s.in.info_ctr = &info_ctr;
+       s.in.devmode_ctr = &devmode_ctr;
+       s.in.secdesc_ctr = &secdesc_ctr;
+
+       q.in.handle = handle;
+       q.out.info = &info;
+       q0 = q;
+
+#define TESTGETCALL(call, r) \
+               r.in.buffer = NULL; \
+               r.in.offered = 0;\
+               r.out.needed = &needed; \
+               status = dcerpc_spoolss_ ##call(p, tctx, &r); \
+               if (!NT_STATUS_IS_OK(status)) { \
+                       torture_comment(tctx, #call " level %u failed - %s (%s)\n", \
+                              r.in.level, nt_errstr(status), __location__); \
+                       ret = false; \
+                       break; \
+               }\
+               if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {\
+                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed); \
+                       data_blob_clear(&blob); \
+                       r.in.buffer = &blob; \
+                       r.in.offered = needed; \
+               }\
+               status = dcerpc_spoolss_ ##call(p, tctx, &r); \
+               if (!NT_STATUS_IS_OK(status)) { \
+                       torture_comment(tctx, #call " level %u failed - %s (%s)\n", \
+                              r.in.level, nt_errstr(status), __location__); \
+                       ret = false; \
+                       break; \
+               } \
+               if (!W_ERROR_IS_OK(r.out.result)) { \
+                       torture_comment(tctx, #call " level %u failed - %s (%s)\n", \
+                              r.in.level, win_errstr(r.out.result), __location__); \
+                       ret = false; \
+                       break; \
+               }
+
+
+#define TESTSETCALL_EXP(call, r, err) \
+               clear_info2(&info_ctr);\
+               status = dcerpc_spoolss_ ##call(p, tctx, &r); \
+               if (!NT_STATUS_IS_OK(status)) { \
+                       torture_comment(tctx, #call " level %u failed - %s (%s)\n", \
+                              r.in.info_ctr->level, nt_errstr(status), __location__); \
+                       ret = false; \
+                       break; \
+               } \
+               if (!W_ERROR_IS_OK(err)) { \
+                       if (!W_ERROR_EQUAL(err, r.out.result)) { \
+                               torture_comment(tctx, #call " level %u failed - %s, expected %s (%s)\n", \
+                                      r.in.info_ctr->level, win_errstr(r.out.result), win_errstr(err), __location__); \
+                               ret = false; \
+                       } \
+                       break; \
+               } \
+               if (!W_ERROR_IS_OK(r.out.result)) { \
+                       torture_comment(tctx, #call " level %u failed - %s (%s)\n", \
+                              r.in.info_ctr->level, win_errstr(r.out.result), __location__); \
+                       ret = false; \
+                       break; \
+               }
+
+#define TESTSETCALL(call, r) \
+       TESTSETCALL_EXP(call, r, WERR_OK)
+
+#define STRING_EQUAL(s1, s2, field) \
+               if ((s1 && !s2) || (s2 && !s1) || strcmp(s1, s2)) { \
+                       torture_comment(tctx, "Failed to set %s to '%s' (%s)\n", \
+                              #field, s2, __location__); \
+                       ret = false; \
+                       break; \
+               }
+
+#define MEM_EQUAL(s1, s2, length, field) \
+               if ((s1 && !s2) || (s2 && !s1) || memcmp(s1, s2, length)) { \
+                       torture_comment(tctx, "Failed to set %s to '%s' (%s)\n", \
+                              #field, (const char *)s2, __location__); \
+                       ret = false; \
+                       break; \
+               }
+
+#define INT_EQUAL(i1, i2, field) \
+               if (i1 != i2) { \
+                       torture_comment(tctx, "Failed to set %s to 0x%llx - got 0x%llx (%s)\n", \
+                              #field, (unsigned long long)i2, (unsigned long long)i1, __location__); \
+                       ret = false; \
+                       break; \
+               }
+
+#define TEST_PRINTERINFO_STRING_EXP_ERR(lvl1, field1, lvl2, field2, value, err) do { \
+               torture_comment(tctx, "field test %d/%s vs %d/%s\n", lvl1, #field1, lvl2, #field2); \
+               q.in.level = lvl1; \
+               TESTGETCALL(GetPrinter, q) \
+               info_ctr.level = lvl1; \
+               info_ctr.info.info ## lvl1 = (struct spoolss_SetPrinterInfo ## lvl1 *)&q.out.info->info ## lvl1; \
+               info_ctr.info.info ## lvl1->field1 = value;\
+               TESTSETCALL_EXP(SetPrinter, s, err) \
+               info_ctr.info.info ## lvl1->field1 = ""; \
+               TESTGETCALL(GetPrinter, q) \
+               info_ctr.info.info ## lvl1->field1 = value; \
+               STRING_EQUAL(info_ctr.info.info ## lvl1->field1, value, field1); \
+               q.in.level = lvl2; \
+               TESTGETCALL(GetPrinter, q) \
+               info_ctr.info.info ## lvl2 = (struct spoolss_SetPrinterInfo ## lvl2 *)&q.out.info->info ## lvl2; \
+               STRING_EQUAL(info_ctr.info.info ## lvl2->field2, value, field2); \
+       } while (0)
+
+#define TEST_PRINTERINFO_STRING(lvl1, field1, lvl2, field2, value) do { \
+       TEST_PRINTERINFO_STRING_EXP_ERR(lvl1, field1, lvl2, field2, value, WERR_OK); \
+       } while (0);
+
+#define TEST_PRINTERINFO_INT_EXP(lvl1, field1, lvl2, field2, value, exp_value) do { \
+               torture_comment(tctx, "field test %d/%s vs %d/%s\n", lvl1, #field1, lvl2, #field2); \
+               q.in.level = lvl1; \
+               TESTGETCALL(GetPrinter, q) \
+               info_ctr.level = lvl1; \
+               info_ctr.info.info ## lvl1 = (struct spoolss_SetPrinterInfo ## lvl1 *)&q.out.info->info ## lvl1; \
+               info_ctr.info.info ## lvl1->field1 = value; \
+               TESTSETCALL(SetPrinter, s) \
+               info_ctr.info.info ## lvl1->field1 = 0; \
+               TESTGETCALL(GetPrinter, q) \
+               info_ctr.info.info ## lvl1 = (struct spoolss_SetPrinterInfo ## lvl1 *)&q.out.info->info ## lvl1; \
+               INT_EQUAL(info_ctr.info.info ## lvl1->field1, exp_value, field1); \
+               q.in.level = lvl2; \
+               TESTGETCALL(GetPrinter, q) \
+               info_ctr.info.info ## lvl2 = (struct spoolss_SetPrinterInfo ## lvl2 *)&q.out.info->info ## lvl2; \
+               INT_EQUAL(info_ctr.info.info ## lvl2->field2, exp_value, field1); \
+       } while (0)
+
+#define TEST_PRINTERINFO_INT(lvl1, field1, lvl2, field2, value) do { \
+        TEST_PRINTERINFO_INT_EXP(lvl1, field1, lvl2, field2, value, value); \
+        } while (0)
+
+       q0.in.level = 0;
+       do { TESTGETCALL(GetPrinter, q0) } while (0);
+
+       TEST_PRINTERINFO_STRING(2, comment,  1, comment, "xx2-1 comment");
+       TEST_PRINTERINFO_STRING(2, comment,  2, comment, "xx2-2 comment");
+
+       /* level 0 printername does not stick */
+/*     TEST_PRINTERINFO_STRING(2, printername,  0, printername, "xx2-0 printer"); */
+       TEST_PRINTERINFO_STRING(2, printername,  1, name,        "xx2-1 printer");
+       TEST_PRINTERINFO_STRING(2, printername,  2, printername, "xx2-2 printer");
+       TEST_PRINTERINFO_STRING(2, printername,  4, printername, "xx2-4 printer");
+       TEST_PRINTERINFO_STRING(2, printername,  5, printername, "xx2-5 printer");
+/*     TEST_PRINTERINFO_STRING(4, printername,  0, printername, "xx4-0 printer"); */
+       TEST_PRINTERINFO_STRING(4, printername,  1, name,        "xx4-1 printer");
+       TEST_PRINTERINFO_STRING(4, printername,  2, printername, "xx4-2 printer");
+       TEST_PRINTERINFO_STRING(4, printername,  4, printername, "xx4-4 printer");
+       TEST_PRINTERINFO_STRING(4, printername,  5, printername, "xx4-5 printer");
+/*     TEST_PRINTERINFO_STRING(5, printername,  0, printername, "xx5-0 printer"); */
+       TEST_PRINTERINFO_STRING(5, printername,  1, name,        "xx5-1 printer");
+       TEST_PRINTERINFO_STRING(5, printername,  2, printername, "xx5-2 printer");
+       TEST_PRINTERINFO_STRING(5, printername,  4, printername, "xx5-4 printer");
+       TEST_PRINTERINFO_STRING(5, printername,  5, printername, "xx5-5 printer");
+
+       /* servername can be set but does not stick
+       TEST_PRINTERINFO_STRING(2, servername,  0, servername, "xx2-0 servername");
+       TEST_PRINTERINFO_STRING(2, servername,  2, servername, "xx2-2 servername");
+       TEST_PRINTERINFO_STRING(2, servername,  4, servername, "xx2-4 servername");
+       */
+
+       /* passing an invalid port will result in WERR_UNKNOWN_PORT */
+       TEST_PRINTERINFO_STRING_EXP_ERR(2, portname,  2, portname, "xx2-2 portname", WERR_UNKNOWN_PORT);
+       TEST_PRINTERINFO_STRING_EXP_ERR(2, portname,  5, portname, "xx2-5 portname", WERR_UNKNOWN_PORT);
+       TEST_PRINTERINFO_STRING_EXP_ERR(5, portname,  2, portname, "xx5-2 portname", WERR_UNKNOWN_PORT);
+       TEST_PRINTERINFO_STRING_EXP_ERR(5, portname,  5, portname, "xx5-5 portname", WERR_UNKNOWN_PORT);
+
+       TEST_PRINTERINFO_STRING(2, sharename,   2, sharename,   "xx2-2 sharename");
+       /* passing an invalid driver will result in WERR_UNKNOWN_PRINTER_DRIVER */
+       TEST_PRINTERINFO_STRING_EXP_ERR(2, drivername,  2, drivername,  "xx2-2 drivername", WERR_UNKNOWN_PRINTER_DRIVER);
+       TEST_PRINTERINFO_STRING(2, location,    2, location,    "xx2-2 location");
+       /* passing an invalid sepfile will result in WERR_INVALID_SEPARATOR_FILE */
+       TEST_PRINTERINFO_STRING_EXP_ERR(2, sepfile,     2, sepfile,     "xx2-2 sepfile", WERR_INVALID_SEPARATOR_FILE);
+       /* passing an invalid printprocessor will result in WERR_UNKNOWN_PRINTPROCESSOR */
+       TEST_PRINTERINFO_STRING_EXP_ERR(2, printprocessor, 2, printprocessor, "xx2-2 printprocessor", WERR_UNKNOWN_PRINTPROCESSOR);
+       TEST_PRINTERINFO_STRING(2, datatype,    2, datatype,    "xx2-2 datatype");
+       TEST_PRINTERINFO_STRING(2, parameters,  2, parameters,  "xx2-2 parameters");
+
+       for (i=0; i < ARRAY_SIZE(attribute_list); i++) {
+/*             TEST_PRINTERINFO_INT_EXP(2, attributes, 1, flags,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       ); */
+               TEST_PRINTERINFO_INT_EXP(2, attributes, 2, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+               TEST_PRINTERINFO_INT_EXP(2, attributes, 4, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+               TEST_PRINTERINFO_INT_EXP(2, attributes, 5, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+/*             TEST_PRINTERINFO_INT_EXP(4, attributes, 1, flags,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       ); */
+               TEST_PRINTERINFO_INT_EXP(4, attributes, 2, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+               TEST_PRINTERINFO_INT_EXP(4, attributes, 4, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+               TEST_PRINTERINFO_INT_EXP(4, attributes, 5, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+/*             TEST_PRINTERINFO_INT_EXP(5, attributes, 1, flags,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       ); */
+               TEST_PRINTERINFO_INT_EXP(5, attributes, 2, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+               TEST_PRINTERINFO_INT_EXP(5, attributes, 4, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+               TEST_PRINTERINFO_INT_EXP(5, attributes, 5, attributes,
+                       attribute_list[i],
+                       (attribute_list[i] | default_attribute)
+                       );
+       }
+
+       for (i=0; i < ARRAY_SIZE(status_list); i++) {
+               /* level 2 sets do not stick
+               TEST_PRINTERINFO_INT(2, status, 0, status, status_list[i]);
+               TEST_PRINTERINFO_INT(2, status, 2, status, status_list[i]);
+               TEST_PRINTERINFO_INT(2, status, 6, status, status_list[i]); */
+               TEST_PRINTERINFO_INT(6, status, 0, status, status_list[i]);
+               TEST_PRINTERINFO_INT(6, status, 2, status, status_list[i]);
+               TEST_PRINTERINFO_INT(6, status, 6, status, status_list[i]);
+       }
+
+       /* priorities need to be between 0 and 99
+          passing an invalid priority will result in WERR_INVALID_PRIORITY */
+       TEST_PRINTERINFO_INT(2, priority,       2, priority, 0);
+       TEST_PRINTERINFO_INT(2, priority,       2, priority, 1);
+       TEST_PRINTERINFO_INT(2, priority,       2, priority, 99);
+       /* TEST_PRINTERINFO_INT(2, priority,    2, priority, 100); */
+       TEST_PRINTERINFO_INT(2, defaultpriority,2, defaultpriority, 0);
+       TEST_PRINTERINFO_INT(2, defaultpriority,2, defaultpriority, 1);
+       TEST_PRINTERINFO_INT(2, defaultpriority,2, defaultpriority, 99);
+       /* TEST_PRINTERINFO_INT(2, defaultpriority,2, defaultpriority, 100); */
+
+       TEST_PRINTERINFO_INT(2, starttime,      2, starttime, __LINE__);
+       TEST_PRINTERINFO_INT(2, untiltime,      2, untiltime, __LINE__);
+
+       /* does not stick
+       TEST_PRINTERINFO_INT(2, cjobs,          2, cjobs, __LINE__);
+       TEST_PRINTERINFO_INT(2, averageppm,     2, averageppm, __LINE__); */
+
+       /* does not stick
+       TEST_PRINTERINFO_INT(5, device_not_selected_timeout, 5, device_not_selected_timeout, __LINE__);
+       TEST_PRINTERINFO_INT(5, transmission_retry_timeout, 5, transmission_retry_timeout, __LINE__); */
+
+       /* FIXME: gd also test devmode and secdesc behavior */
+
+       {
+               /* verify composition of level 1 description field */
+               const char *description;
+               const char *tmp;
+
+               q0.in.level = 1;
+               do { TESTGETCALL(GetPrinter, q0) } while (0);
+
+               description = talloc_strdup(tctx, q0.out.info->info1.description);
+
+               q0.in.level = 2;
+               do { TESTGETCALL(GetPrinter, q0) } while (0);
+
+               tmp = talloc_asprintf(tctx, "%s,%s,%s",
+                       q0.out.info->info2.printername,
+                       q0.out.info->info2.drivername,
+                       q0.out.info->info2.location);
+
+               do { STRING_EQUAL(description, tmp, "description")} while (0);
+       }
+
+       return ret;
+}
+
 
-static bool test_ClosePrinter(struct torture_context *tctx, 
-                             struct dcerpc_pipe *p, 
+static bool test_ClosePrinter(struct torture_context *tctx,
+                             struct dcerpc_pipe *p,
                              struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -652,34 +1417,38 @@ static bool test_ClosePrinter(struct torture_context *tctx,
 
        status = dcerpc_spoolss_ClosePrinter(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ClosePrinter failed");
+       torture_assert_werr_ok(tctx, r.out.result, "ClosePrinter failed");
 
        return true;
 }
 
-static bool test_GetForm(struct torture_context *tctx, 
-                        struct dcerpc_pipe *p, 
-                        struct policy_handle *handle, 
-                        const char *form_name)
+static bool test_GetForm(struct torture_context *tctx,
+                        struct dcerpc_pipe *p,
+                        struct policy_handle *handle,
+                        const char *form_name,
+                        uint32_t level)
 {
        NTSTATUS status;
        struct spoolss_GetForm r;
+       uint32_t needed;
 
        r.in.handle = handle;
        r.in.form_name = form_name;
-       r.in.level = 1;
+       r.in.level = level;
        r.in.buffer = NULL;
        r.in.offered = 0;
+       r.out.needed = &needed;
 
-       torture_comment(tctx, "Testing GetForm\n");
+       torture_comment(tctx, "Testing GetForm level %d\n", r.in.level);
 
        status = dcerpc_spoolss_GetForm(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "GetForm failed");
 
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, r.out.needed);
+               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
                data_blob_clear(&blob);
                r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
                status = dcerpc_spoolss_GetForm(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "GetForm failed");
 
@@ -693,57 +1462,70 @@ static bool test_GetForm(struct torture_context *tctx,
        return true;
 }
 
-static bool test_EnumForms(struct torture_context *tctx, 
-                          struct dcerpc_pipe *p, 
+static bool test_EnumForms(struct torture_context *tctx,
+                          struct dcerpc_pipe *p,
                           struct policy_handle *handle, bool print_server)
 {
        NTSTATUS status;
        struct spoolss_EnumForms r;
        bool ret = true;
+       uint32_t needed;
+       uint32_t count;
+       uint32_t levels[] = { 1, 2 };
+       int i;
 
-       r.in.handle = handle;
-       r.in.level = 1;
-       r.in.buffer = NULL;
-       r.in.offered = 0;
-
-       torture_comment(tctx, "Testing EnumForms\n");
-
-       status = dcerpc_spoolss_EnumForms(p, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "EnumForms failed");
-
-       if (print_server && W_ERROR_EQUAL(r.out.result, WERR_BADFID))
-               torture_fail(tctx, "EnumForms on the PrintServer isn't supported by test server (NT4)");
+       for (i=0; i<ARRAY_SIZE(levels); i++) {
 
-       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
                union spoolss_FormInfo *info;
-               int j;
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, r.out.needed);
-               data_blob_clear(&blob);
-               r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
 
-               status = dcerpc_spoolss_EnumForms(p, tctx, &r);
+               r.in.handle = handle;
+               r.in.level = levels[i];
+               r.in.buffer = NULL;
+               r.in.offered = 0;
+               r.out.needed = &needed;
+               r.out.count = &count;
+               r.out.info = &info;
 
-               torture_assert(tctx, r.out.info, "No forms returned");
+               torture_comment(tctx, "Testing EnumForms level %d\n", levels[i]);
 
-               info = r.out.info;
+               status = dcerpc_spoolss_EnumForms(p, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "EnumForms failed");
 
-               for (j = 0; j < r.out.count; j++) {
-                       if (!print_server) 
-                               ret &= test_GetForm(tctx, p, handle, info[j].info1.form_name);
+               if ((r.in.level == 2) && (W_ERROR_EQUAL(r.out.result, WERR_UNKNOWN_LEVEL))) {
+                       break;
                }
-       }
 
-       torture_assert_ntstatus_ok(tctx, status, "EnumForms failed");
+               if (print_server && W_ERROR_EQUAL(r.out.result, WERR_BADFID))
+                       torture_fail(tctx, "EnumForms on the PrintServer isn't supported by test server (NT4)");
 
-       torture_assert_werr_ok(tctx, r.out.result, "EnumForms failed");
+               if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+                       int j;
+                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+                       data_blob_clear(&blob);
+                       r.in.buffer = &blob;
+                       r.in.offered = needed;
 
-       return true;
-}
+                       status = dcerpc_spoolss_EnumForms(p, tctx, &r);
 
-static bool test_DeleteForm(struct torture_context *tctx, 
-                           struct dcerpc_pipe *p, 
-                           struct policy_handle *handle, 
+                       torture_assert(tctx, info, "No forms returned");
+
+                       for (j = 0; j < count; j++) {
+                               if (!print_server)
+                                       ret &= test_GetForm(tctx, p, handle, info[j].info1.form_name, levels[i]);
+                       }
+               }
+
+               torture_assert_ntstatus_ok(tctx, status, "EnumForms failed");
+
+               torture_assert_werr_ok(tctx, r.out.result, "EnumForms failed");
+       }
+
+       return true;
+}
+
+static bool test_DeleteForm(struct torture_context *tctx,
+                           struct dcerpc_pipe *p,
+                           struct policy_handle *handle,
                            const char *form_name)
 {
        NTSTATUS status;
@@ -761,8 +1543,8 @@ static bool test_DeleteForm(struct torture_context *tctx,
        return true;
 }
 
-static bool test_AddForm(struct torture_context *tctx, 
-                        struct dcerpc_pipe *p, 
+static bool test_AddForm(struct torture_context *tctx,
+                        struct dcerpc_pipe *p,
                         struct policy_handle *handle, bool print_server)
 {
        struct spoolss_AddForm r;
@@ -789,7 +1571,7 @@ static bool test_AddForm(struct torture_context *tctx,
 
        torture_assert_werr_ok(tctx, r.out.result, "AddForm failed");
 
-       if (!print_server) ret &= test_GetForm(tctx, p, handle, form_name);
+       if (!print_server) ret &= test_GetForm(tctx, p, handle, form_name, 1);
 
        {
                struct spoolss_SetForm sf;
@@ -813,7 +1595,51 @@ static bool test_AddForm(struct torture_context *tctx,
                torture_assert_werr_ok(tctx, r.out.result, "SetForm failed");
        }
 
-       if (!print_server) ret &= test_GetForm(tctx, p, handle, form_name);
+       if (!print_server) ret &= test_GetForm(tctx, p, handle, form_name, 1);
+
+       {
+               struct spoolss_EnumForms e;
+               union spoolss_FormInfo *info;
+               uint32_t needed;
+               uint32_t count;
+               bool found = false;
+
+               e.in.handle = handle;
+               e.in.level = 1;
+               e.in.buffer = NULL;
+               e.in.offered = 0;
+               e.out.needed = &needed;
+               e.out.count = &count;
+               e.out.info = &info;
+
+               torture_comment(tctx, "Testing EnumForms level 1\n");
+
+               status = dcerpc_spoolss_EnumForms(p, tctx, &e);
+               torture_assert_ntstatus_ok(tctx, status, "EnumForms failed");
+
+               if (print_server && W_ERROR_EQUAL(e.out.result, WERR_BADFID))
+                       torture_fail(tctx, "EnumForms on the PrintServer isn't supported by test server (NT4)");
+
+               if (W_ERROR_EQUAL(e.out.result, WERR_INSUFFICIENT_BUFFER)) {
+                       int j;
+                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+                       data_blob_clear(&blob);
+                       e.in.buffer = &blob;
+                       e.in.offered = needed;
+
+                       status = dcerpc_spoolss_EnumForms(p, tctx, &e);
+
+                       torture_assert(tctx, info, "No forms returned");
+
+                       for (j = 0; j < count; j++) {
+                               if (strequal(form_name, info[j].info1.form_name)) {
+                                       found = true;
+                                       break;
+                               }
+                       }
+               }
+               torture_assert(tctx, found, "Newly added form not found in enum call");
+       }
 
        if (!test_DeleteForm(tctx, p, handle, form_name)) {
                ret = false;
@@ -822,17 +1648,23 @@ static bool test_AddForm(struct torture_context *tctx,
        return ret;
 }
 
-static bool test_EnumPorts_old(struct torture_context *tctx, 
+static bool test_EnumPorts_old(struct torture_context *tctx,
                               struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct spoolss_EnumPorts r;
+       uint32_t needed;
+       uint32_t count;
+       union spoolss_PortInfo *info;
 
-       r.in.servername = talloc_asprintf(tctx, "\\\\%s", 
+       r.in.servername = talloc_asprintf(tctx, "\\\\%s",
                                          dcerpc_server_name(p));
        r.in.level = 2;
        r.in.buffer = NULL;
        r.in.offered = 0;
+       r.out.needed = &needed;
+       r.out.count = &count;
+       r.out.info = &info;
 
        torture_comment(tctx, "Testing EnumPorts\n");
 
@@ -841,27 +1673,30 @@ static bool test_EnumPorts_old(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx, status, "EnumPorts failed");
 
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, r.out.needed);
+               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
                data_blob_clear(&blob);
                r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
 
                status = dcerpc_spoolss_EnumPorts(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "EnumPorts failed");
+               torture_assert_werr_ok(tctx, r.out.result, "EnumPorts failed");
 
-               torture_assert(tctx, r.out.info, "No ports returned");
+               torture_assert(tctx, info, "No ports returned");
        }
 
+       torture_assert_werr_ok(tctx, r.out.result, "EnumPorts failed");
+
        return true;
 }
 
-static bool test_AddPort(struct torture_context *tctx, 
+static bool test_AddPort(struct torture_context *tctx,
                         struct dcerpc_pipe *p)
 {
        NTSTATUS status;
        struct spoolss_AddPort r;
 
-       r.in.server_name = talloc_asprintf(tctx, "\\\\%s", 
+       r.in.server_name = talloc_asprintf(tctx, "\\\\%s",
                                           dcerpc_server_name(p));
        r.in.unknown = 0;
        r.in.monitor_name = "foo";
@@ -886,43 +1721,63 @@ static bool test_AddPort(struct torture_context *tctx,
        return true;
 }
 
-static bool test_GetJob(struct torture_context *tctx, 
-                       struct dcerpc_pipe *p, 
+static bool test_GetJob(struct torture_context *tctx,
+                       struct dcerpc_pipe *p,
                        struct policy_handle *handle, uint32_t job_id)
 {
        NTSTATUS status;
        struct spoolss_GetJob r;
+       union spoolss_JobInfo info;
        uint32_t needed;
+       uint32_t levels[] = {1, 2 /* 3, 4 */};
+       uint32_t i;
 
        r.in.handle = handle;
        r.in.job_id = job_id;
-       r.in.level = 1;
+       r.in.level = 0;
        r.in.buffer = NULL;
        r.in.offered = 0;
        r.out.needed = &needed;
+       r.out.info = &info;
 
-       torture_comment(tctx, "Testing GetJob\n");
+       torture_comment(tctx, "Testing GetJob level %d\n", r.in.level);
 
        status = dcerpc_spoolss_GetJob(p, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
+       torture_assert_werr_equal(tctx, r.out.result, WERR_UNKNOWN_LEVEL, "Unexpected return code");
 
-       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
-               r.in.buffer = &blob;
-               r.in.offered = needed;
+       for (i = 0; i < ARRAY_SIZE(levels); i++) {
+
+               torture_comment(tctx, "Testing GetJob level %d\n", r.in.level);
+
+               needed = 0;
+
+               r.in.level = levels[i];
+               r.in.offered = 0;
+               r.in.buffer = NULL;
 
                status = dcerpc_spoolss_GetJob(p, tctx, &r);
+               torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
 
+               if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+                       data_blob_clear(&blob);
+                       r.in.buffer = &blob;
+                       r.in.offered = needed;
+
+                       status = dcerpc_spoolss_GetJob(p, tctx, &r);
+                       torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
+
+               }
                torture_assert(tctx, r.out.info, "No job info returned");
+               torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
        }
 
        return true;
 }
 
-static bool test_SetJob(struct torture_context *tctx, 
-                       struct dcerpc_pipe *p, 
-                       struct policy_handle *handle, uint32_t job_id, 
+static bool test_SetJob(struct torture_context *tctx,
+                       struct dcerpc_pipe *p,
+                       struct policy_handle *handle, uint32_t job_id,
                        enum spoolss_JobControl command)
 {
        NTSTATUS status;
@@ -933,7 +1788,38 @@ static bool test_SetJob(struct torture_context *tctx,
        r.in.ctr        = NULL;
        r.in.command    = command;
 
-       torture_comment(tctx, "Testing SetJob\n");
+       switch (command) {
+       case SPOOLSS_JOB_CONTROL_PAUSE:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_PAUSE\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_RESUME:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RESUME\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_CANCEL:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_CANCEL\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_RESTART:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RESTART\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_DELETE:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_DELETE\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_RETAIN:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RETAIN\n");
+               break;
+       case SPOOLSS_JOB_CONTROL_RELEASE:
+               torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RELEASE\n");
+               break;
+       default:
+               torture_comment(tctx, "Testing SetJob\n");
+               break;
+       }
 
        status = dcerpc_spoolss_SetJob(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "SetJob failed");
@@ -942,12 +1828,43 @@ static bool test_SetJob(struct torture_context *tctx,
        return true;
 }
 
-static bool test_EnumJobs(struct torture_context *tctx, 
-                         struct dcerpc_pipe *p, 
+static bool test_AddJob(struct torture_context *tctx,
+                       struct dcerpc_pipe *p,
+                       struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct spoolss_AddJob r;
+       uint32_t needed;
+
+       r.in.level = 0;
+       r.in.handle = handle;
+       r.in.offered = 0;
+       r.out.needed = &needed;
+       r.in.buffer = r.out.buffer = NULL;
+
+       torture_comment(tctx, "Testing AddJob\n");
+
+       status = dcerpc_spoolss_AddJob(p, tctx, &r);
+       torture_assert_werr_equal(tctx, r.out.result, WERR_UNKNOWN_LEVEL, "AddJob failed");
+
+       r.in.level = 1;
+
+       status = dcerpc_spoolss_AddJob(p, tctx, &r);
+       torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM, "AddJob failed");
+
+       return true;
+}
+
+
+static bool test_EnumJobs(struct torture_context *tctx,
+                         struct dcerpc_pipe *p,
                          struct policy_handle *handle)
 {
        NTSTATUS status;
        struct spoolss_EnumJobs r;
+       uint32_t needed;
+       uint32_t count;
+       union spoolss_JobInfo *info;
 
        r.in.handle = handle;
        r.in.firstjob = 0;
@@ -955,6 +1872,9 @@ static bool test_EnumJobs(struct torture_context *tctx,
        r.in.level = 1;
        r.in.buffer = NULL;
        r.in.offered = 0;
+       r.out.needed = &needed;
+       r.out.count = &count;
+       r.out.info = &info;
 
        torture_comment(tctx, "Testing EnumJobs\n");
 
@@ -963,23 +1883,28 @@ static bool test_EnumJobs(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx, status, "EnumJobs failed");
 
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               union spoolss_JobInfo *info;
                int j;
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, r.out.needed);
+               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
                data_blob_clear(&blob);
                r.in.buffer = &blob;
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
 
                status = dcerpc_spoolss_EnumJobs(p, tctx, &r);
 
-               torture_assert(tctx, r.out.info, "No jobs returned");
+               torture_assert_ntstatus_ok(tctx, status, "EnumJobs failed");
+               torture_assert_werr_ok(tctx, r.out.result, "EnumJobs failed");
+               torture_assert(tctx, info, "No jobs returned");
+
+               for (j = 0; j < count; j++) {
 
-               info = r.out.info;
+                       torture_assert(tctx, test_GetJob(tctx, p, handle, info[j].info1.job_id),
+                               "failed to call test_GetJob");
 
-               for (j = 0; j < r.out.count; j++) {
-                       test_GetJob(tctx, p, handle, info[j].info1.job_id);
-                       test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_PAUSE);
-                       test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_RESUME);
+                       /* FIXME - gd */
+                       if (!torture_setting_bool(tctx, "samba3", false)) {
+                               test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_PAUSE);
+                               test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_RESUME);
+                       }
                }
 
        } else {
@@ -989,8 +1914,8 @@ static bool test_EnumJobs(struct torture_context *tctx,
        return true;
 }
 
-static bool test_DoPrintTest(struct torture_context *tctx, 
-                            struct dcerpc_pipe *p, 
+static bool test_DoPrintTest(struct torture_context *tctx,
+                            struct dcerpc_pipe *p,
                             struct policy_handle *handle)
 {
        bool ret = true;
@@ -1025,7 +1950,7 @@ static bool test_DoPrintTest(struct torture_context *tctx,
                sp.in.handle            = handle;
 
                status = dcerpc_spoolss_StartPagePrinter(p, tctx, &sp);
-               torture_assert_ntstatus_ok(tctx, status, 
+               torture_assert_ntstatus_ok(tctx, status,
                                           "dcerpc_spoolss_StartPagePrinter failed");
                torture_assert_werr_ok(tctx, sp.out.result, "StartPagePrinter failed");
 
@@ -1056,6 +1981,7 @@ static bool test_DoPrintTest(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EndDocPrinter failed");
        torture_assert_werr_ok(tctx, e.out.result, "EndDocPrinter failed");
 
+       ret &= test_AddJob(tctx, p, handle);
        ret &= test_EnumJobs(tctx, p, handle);
 
        ret &= test_SetJob(tctx, p, handle, job_id, SPOOLSS_JOB_CONTROL_DELETE);
@@ -1063,18 +1989,26 @@ static bool test_DoPrintTest(struct torture_context *tctx,
        return ret;
 }
 
-static bool test_PausePrinter(struct torture_context *tctx, 
-                             struct dcerpc_pipe *p, 
+static bool test_PausePrinter(struct torture_context *tctx,
+                             struct dcerpc_pipe *p,
                              struct policy_handle *handle)
 {
        NTSTATUS status;
        struct spoolss_SetPrinter r;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+
+       info_ctr.level = 0;
+       info_ctr.info.info0 = NULL;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
 
        r.in.handle             = handle;
-       r.in.level              = 0;
-       r.in.info.info1         = NULL;
-       r.in.devmode_ctr.devmode= NULL;
-       r.in.secdesc_ctr.sd     = NULL;
+       r.in.info_ctr           = &info_ctr;
+       r.in.devmode_ctr        = &devmode_ctr;
+       r.in.secdesc_ctr        = &secdesc_ctr;
        r.in.command            = SPOOLSS_PRINTER_CONTROL_PAUSE;
 
        torture_comment(tctx, "Testing SetPrinter: SPOOLSS_PRINTER_CONTROL_PAUSE\n");
@@ -1088,18 +2022,26 @@ static bool test_PausePrinter(struct torture_context *tctx,
        return true;
 }
 
-static bool test_ResumePrinter(struct torture_context *tctx, 
-                              struct dcerpc_pipe *p, 
+static bool test_ResumePrinter(struct torture_context *tctx,
+                              struct dcerpc_pipe *p,
                               struct policy_handle *handle)
 {
        NTSTATUS status;
        struct spoolss_SetPrinter r;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+
+       info_ctr.level = 0;
+       info_ctr.info.info0 = NULL;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
 
        r.in.handle             = handle;
-       r.in.level              = 0;
-       r.in.info.info1         = NULL;
-       r.in.devmode_ctr.devmode= NULL;
-       r.in.secdesc_ctr.sd     = NULL;
+       r.in.info_ctr           = &info_ctr;
+       r.in.devmode_ctr        = &devmode_ctr;
+       r.in.secdesc_ctr        = &secdesc_ctr;
        r.in.command            = SPOOLSS_PRINTER_CONTROL_RESUME;
 
        torture_comment(tctx, "Testing SetPrinter: SPOOLSS_PRINTER_CONTROL_RESUME\n");
@@ -1113,50 +2055,76 @@ static bool test_ResumePrinter(struct torture_context *tctx,
        return true;
 }
 
-static bool test_GetPrinterData(struct torture_context *tctx, 
-                               struct dcerpc_pipe *p, 
-                               struct policy_handle *handle, 
-                               const char *value_name)
+static bool test_GetPrinterData(struct torture_context *tctx,
+                               struct dcerpc_pipe *p,
+                               struct policy_handle *handle,
+                               const char *value_name,
+                               enum winreg_Type *type_p,
+                               union spoolss_PrinterData *data_p)
 {
        NTSTATUS status;
        struct spoolss_GetPrinterData r;
+       uint32_t needed;
+       enum winreg_Type type;
+       union spoolss_PrinterData data;
 
        r.in.handle = handle;
        r.in.value_name = value_name;
        r.in.offered = 0;
+       r.out.needed = &needed;
+       r.out.type = &type;
+       r.out.data = &data;
 
-       torture_comment(tctx, "Testing GetPrinterData\n");
+       torture_comment(tctx, "Testing GetPrinterData(%s)\n", r.in.value_name);
 
        status = dcerpc_spoolss_GetPrinterData(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "GetPrinterData failed");
 
        if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
-               r.in.offered = r.out.needed;
+               r.in.offered = needed;
 
                status = dcerpc_spoolss_GetPrinterData(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "GetPrinterData failed");
+       }
+
+       torture_assert_werr_ok(tctx, r.out.result,
+               talloc_asprintf(tctx, "GetPrinterData(%s) failed", r.in.value_name));
+
+       if (type_p) {
+               *type_p = type;
+       }
 
-               torture_assert_werr_ok(tctx, r.out.result, "GetPrinterData failed");
+       if (data_p) {
+               *data_p = data;
        }
 
        return true;
 }
 
-static bool test_GetPrinterDataEx(struct torture_context *tctx, 
-                                 struct dcerpc_pipe *p, 
-                                 struct policy_handle *handle, 
+static bool test_GetPrinterDataEx(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p,
+                                 struct policy_handle *handle,
                                  const char *key_name,
-                                 const char *value_name)
+                                 const char *value_name,
+                                 enum winreg_Type *type_p,
+                                 union spoolss_PrinterData *data_p)
 {
        NTSTATUS status;
        struct spoolss_GetPrinterDataEx r;
+       enum winreg_Type type;
+       uint32_t needed;
+       union spoolss_PrinterData data;
 
        r.in.handle = handle;
        r.in.key_name = key_name;
        r.in.value_name = value_name;
        r.in.offered = 0;
+       r.out.type = &type;
+       r.out.needed = &needed;
+       r.out.data = &data;
 
-       torture_comment(tctx, "Testing GetPrinterDataEx\n");
+       torture_comment(tctx, "Testing GetPrinterDataEx(%s - %s)\n",
+               r.in.key_name, r.in.value_name);
 
        status = dcerpc_spoolss_GetPrinterDataEx(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1168,18 +2136,74 @@ static bool test_GetPrinterDataEx(struct torture_context *tctx,
        }
 
        if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
-               r.in.offered = r.out.needed;
-
+               r.in.offered = needed;
                status = dcerpc_spoolss_GetPrinterDataEx(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "GetPrinterDataEx failed");
+       }
+
+       torture_assert_werr_ok(tctx, r.out.result,
+               talloc_asprintf(tctx, "GetPrinterDataEx(%s - %s) failed", r.in.key_name, r.in.value_name));
+
+       if (type_p) {
+               *type_p = type;
+       }
 
-               torture_assert_werr_ok(tctx, r.out.result,  "GetPrinterDataEx failed");
+       if (data_p) {
+               *data_p = data;
        }
 
        return true;
 }
 
-static bool test_EnumPrinterData(struct torture_context *tctx, struct dcerpc_pipe *p, 
+static bool test_GetPrinterData_list(struct torture_context *tctx,
+                                    struct dcerpc_pipe *p,
+                                    struct policy_handle *handle)
+{
+       const char *list[] = {
+               "W3SvcInstalled",
+               "BeepEnabled",
+               "EventLog",
+               /* "NetPopup", not on w2k8 */
+               /* "NetPopupToComputer", not on w2k8 */
+               "MajorVersion",
+               "MinorVersion",
+               "DefaultSpoolDirectory",
+               "Architecture",
+               "DsPresent",
+               "OSVersion",
+               /* "OSVersionEx", not on s3 */
+               "DNSMachineName"
+       };
+       int i;
+
+       for (i=0; i < ARRAY_SIZE(list); i++) {
+               enum winreg_Type type, type_ex;
+               union spoolss_PrinterData data, data_ex;
+
+               torture_assert(tctx, test_GetPrinterData(tctx, p, handle, list[i], &type, &data),
+                       talloc_asprintf(tctx, "GetPrinterData failed on %s\n", list[i]));
+               torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "random_string", list[i], &type_ex, &data_ex),
+                       talloc_asprintf(tctx, "GetPrinterDataEx failed on %s\n", list[i]));
+               torture_assert_int_equal(tctx, type, type_ex, "type mismatch");
+               switch (type) {
+               case REG_SZ:
+                       torture_assert_str_equal(tctx, data.string, data_ex.string, "REG_SZ mismatch");
+                       break;
+               case REG_DWORD:
+                       torture_assert_int_equal(tctx, data.value, data_ex.value, "REG_DWORD mismatch");
+                       break;
+               case REG_BINARY:
+                       torture_assert_data_blob_equal(tctx, data.binary, data_ex.binary, "REG_BINARY mismatch");
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       return true;
+}
+
+static bool test_EnumPrinterData(struct torture_context *tctx, struct dcerpc_pipe *p,
                                 struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -1192,35 +2216,45 @@ static bool test_EnumPrinterData(struct torture_context *tctx, struct dcerpc_pip
        do {
                uint32_t value_size = 0;
                uint32_t data_size = 0;
-               uint32_t printerdata_type = 0;
-               DATA_BLOB data = data_blob(NULL,0);
+               enum winreg_Type type = 0;
 
                r.in.value_offered = value_size;
                r.out.value_needed = &value_size;
                r.in.data_offered = data_size;
                r.out.data_needed = &data_size;
 
-               r.out.printerdata_type = &printerdata_type;
-               r.out.buffer = &data;
+               r.out.type = &type;
+               r.out.data = talloc_zero_array(tctx, uint8_t, 0);
 
                torture_comment(tctx, "Testing EnumPrinterData\n");
 
                status = dcerpc_spoolss_EnumPrinterData(p, tctx, &r);
 
                torture_assert_ntstatus_ok(tctx, status, "EnumPrinterData failed");
+               if (W_ERROR_EQUAL(r.out.result, WERR_NO_MORE_ITEMS)) {
+                       break;
+               }
+               torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterData");
 
                r.in.value_offered = value_size;
+               r.out.value_name = talloc_zero_array(tctx, const char, value_size);
                r.in.data_offered = data_size;
+               r.out.data = talloc_zero_array(tctx, uint8_t, data_size);
 
                status = dcerpc_spoolss_EnumPrinterData(p, tctx, &r);
 
                torture_assert_ntstatus_ok(tctx, status, "EnumPrinterData failed");
-               
-               test_GetPrinterData(tctx, p, handle, r.out.value_name);
+               if (W_ERROR_EQUAL(r.out.result, WERR_NO_MORE_ITEMS)) {
+                       break;
+               }
+
+               torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterData failed");
+
+               torture_assert(tctx, test_GetPrinterData(tctx, p, handle, r.out.value_name, NULL, NULL),
+                       talloc_asprintf(tctx, "failed to call GetPrinterData for %s\n", r.out.value_name));
 
-               test_GetPrinterDataEx(tctx, 
-                       p, handle, "PrinterDriverData", 
-                       r.out.value_name);
+               torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", r.out.value_name, NULL, NULL),
+                       talloc_asprintf(tctx, "failed to call GetPrinterDataEx on PrinterDriverData for %s\n", r.out.value_name));
 
                r.in.enum_index++;
 
@@ -1229,35 +2263,42 @@ static bool test_EnumPrinterData(struct torture_context *tctx, struct dcerpc_pip
        return true;
 }
 
-static bool test_EnumPrinterDataEx(struct torture_context *tctx, 
-                                  struct dcerpc_pipe *p, 
-                                  struct policy_handle *handle)
+static bool test_EnumPrinterDataEx(struct torture_context *tctx,
+                                  struct dcerpc_pipe *p,
+                                  struct policy_handle *handle,
+                                  const char *key_name)
 {
-       NTSTATUS status;
        struct spoolss_EnumPrinterDataEx r;
+       struct spoolss_PrinterEnumValues *info;
+       uint32_t needed;
+       uint32_t count;
 
        r.in.handle = handle;
-       r.in.key_name = "PrinterDriverData";
+       r.in.key_name = key_name;
        r.in.offered = 0;
+       r.out.needed = &needed;
+       r.out.count = &count;
+       r.out.info = &info;
 
-       torture_comment(tctx, "Testing EnumPrinterDataEx\n");
-
-       status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "EnumPrinterDataEx failed");
-
-       r.in.offered = r.out.needed;
+       torture_comment(tctx, "Testing EnumPrinterDataEx(%s)\n", key_name);
 
-       status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterDataEx(p, tctx, &r),
+               "EnumPrinterDataEx failed");
+       if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
+               r.in.offered = needed;
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterDataEx(p, tctx, &r),
+                       "EnumPrinterDataEx failed");
+       }
 
-       torture_assert_ntstatus_ok(tctx, status, "EnumPrinterDataEx failed");
+       torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDataEx failed");
 
        return true;
 }
 
 
-static bool test_DeletePrinterData(struct torture_context *tctx, 
-                                  struct dcerpc_pipe *p, 
-                                  struct policy_handle *handle, 
+static bool test_DeletePrinterData(struct torture_context *tctx,
+                                  struct dcerpc_pipe *p,
+                                  struct policy_handle *handle,
                                   const char *value_name)
 {
        NTSTATUS status;
@@ -1266,47 +2307,237 @@ static bool test_DeletePrinterData(struct torture_context *tctx,
        r.in.handle = handle;
        r.in.value_name = value_name;
 
-       torture_comment(tctx, "Testing DeletePrinterData\n");
+       torture_comment(tctx, "Testing DeletePrinterData(%s)\n",
+               r.in.value_name);
 
        status = dcerpc_spoolss_DeletePrinterData(p, tctx, &r);
 
        torture_assert_ntstatus_ok(tctx, status, "DeletePrinterData failed");
+       torture_assert_werr_ok(tctx, r.out.result, "DeletePrinterData failed");
+
+       return true;
+}
+
+static bool test_DeletePrinterDataEx(struct torture_context *tctx,
+                                    struct dcerpc_pipe *p,
+                                    struct policy_handle *handle,
+                                    const char *key_name,
+                                    const char *value_name)
+{
+       struct spoolss_DeletePrinterDataEx r;
+
+       r.in.handle = handle;
+       r.in.key_name = key_name;
+       r.in.value_name = value_name;
+
+       torture_comment(tctx, "Testing DeletePrinterDataEx(%s - %s)\n",
+               r.in.key_name, r.in.value_name);
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_DeletePrinterDataEx(p, tctx, &r),
+               "DeletePrinterDataEx failed");
+       torture_assert_werr_ok(tctx, r.out.result,
+               "DeletePrinterDataEx failed");
 
        return true;
 }
 
-static bool test_SetPrinterData(struct torture_context *tctx, 
-                               struct dcerpc_pipe *p, 
+static bool test_DeletePrinterKey(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p,
+                                 struct policy_handle *handle,
+                                 const char *key_name)
+{
+       struct spoolss_DeletePrinterKey r;
+
+       r.in.handle = handle;
+       r.in.key_name = key_name;
+
+       torture_comment(tctx, "Testing DeletePrinterKey(%s)\n", r.in.key_name);
+
+       if (strequal(key_name, "") && !torture_setting_bool(tctx, "dangerous", false)) {
+               torture_skip(tctx, "not wiping out printer registry - enable dangerous tests to use\n");
+               return true;
+       }
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_DeletePrinterKey(p, tctx, &r),
+               "DeletePrinterKey failed");
+       torture_assert_werr_ok(tctx, r.out.result,
+               "DeletePrinterKey failed");
+
+       return true;
+}
+
+static bool test_SetPrinterData(struct torture_context *tctx,
+                               struct dcerpc_pipe *p,
                                struct policy_handle *handle)
 {
        NTSTATUS status;
        struct spoolss_SetPrinterData r;
-       const char *value_name = "spottyfoot";
-       
-       r.in.handle = handle;
-       r.in.value_name = value_name;
-       r.in.type = SPOOLSS_PRINTER_DATA_TYPE_STRING;
-       r.in.data.string = "dog";
+       const char *values[] = {
+               "spootyfoot",
+               "spooty\\foot",
+#if 0
+       /* FIXME: not working with s3 atm. */
+               "spooty,foot",
+               "spooty,fo,ot",
+#endif
+               "spooty foot",
+#if 0
+       /* FIXME: not working with s3 atm. */
+               "spooty\\fo,ot",
+               "spooty,fo\\ot"
+#endif
+       };
+       int i;
 
-       torture_comment(tctx, "Testing SetPrinterData\n");
+       for (i=0; i < ARRAY_SIZE(values); i++) {
 
-       status = dcerpc_spoolss_SetPrinterData(p, tctx, &r);
+               enum winreg_Type type;
+               union spoolss_PrinterData data;
 
-       torture_assert_ntstatus_ok(tctx, status, "SetPrinterData failed");
+               r.in.handle = handle;
+               r.in.value_name = values[i];
+               r.in.type = REG_SZ;
+               r.in.data.string = "dog";
 
-       if (!test_GetPrinterData(tctx, p, handle, value_name)) {
-               return false;
+               torture_comment(tctx, "Testing SetPrinterData(%s)\n",
+                       r.in.value_name);
+
+               status = dcerpc_spoolss_SetPrinterData(p, tctx, &r);
+
+               torture_assert_ntstatus_ok(tctx, status, "SetPrinterData failed");
+               torture_assert_werr_ok(tctx, r.out.result, "SetPrinterData failed");
+
+               if (!test_GetPrinterData(tctx, p, handle, r.in.value_name, &type, &data)) {
+                       return false;
+               }
+
+               torture_assert_int_equal(tctx, r.in.type, type, "type mismatch");
+               torture_assert_str_equal(tctx, r.in.data.string, data.string, "data mismatch");
+
+               if (!test_DeletePrinterData(tctx, p, handle, r.in.value_name)) {
+                       return false;
+               }
        }
 
-       if (!test_DeletePrinterData(tctx, p, handle, value_name)) {
-               return false;
+       return true;
+}
+
+static bool test_EnumPrinterKey(struct torture_context *tctx,
+                               struct dcerpc_pipe *p,
+                               struct policy_handle *handle,
+                               const char *key_name,
+                               const char ***array);
+
+static bool test_SetPrinterDataEx(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p,
+                                 struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct spoolss_SetPrinterDataEx r;
+       const char *value_name = "dog";
+       const char *keys[] = {
+               "torturedataex",
+               "torture data ex",
+#if 0
+       /* FIXME: not working with s3 atm. */
+               "torturedataex_with_subkey\\subkey",
+               "torturedataex_with_subkey\\subkey:0",
+               "torturedataex_with_subkey\\subkey:1",
+               "torturedataex_with_subkey\\subkey\\subsubkey",
+               "torturedataex_with_subkey\\subkey\\subsubkey:0",
+               "torturedataex_with_subkey\\subkey\\subsubkey:1",
+#endif
+               "torture,data",
+#if 0
+       /* FIXME: not working with s3 atm. */
+
+               "torture,data,ex",
+               "torture,data\\ex",
+               "torture\\data,ex"
+#endif
+       };
+       int i;
+       DATA_BLOB blob = data_blob_string_const("catfoobar");
+
+
+       for (i=0; i < ARRAY_SIZE(keys); i++) {
+
+               char *c;
+               const char *key;
+               enum winreg_Type type;
+               const char **subkeys;
+               union spoolss_PrinterData data;
+
+               r.in.handle = handle;
+               r.in.key_name = keys[i];
+               r.in.value_name = value_name;
+               r.in.type = REG_BINARY;
+               r.in.data.binary = blob;
+
+               torture_comment(tctx, "Testing SetPrinterDataEx(%s - %s)\n", r.in.key_name, value_name);
+
+               status = dcerpc_spoolss_SetPrinterDataEx(p, tctx, &r);
+
+               torture_assert_ntstatus_ok(tctx, status, "SetPrinterDataEx failed");
+               torture_assert_werr_ok(tctx, r.out.result, "SetPrinterDataEx failed");
+
+               key = talloc_strdup(tctx, r.in.key_name);
+
+               if (!test_GetPrinterDataEx(tctx, p, handle, r.in.key_name, value_name, &type, &data)) {
+                       return false;
+               }
+
+               torture_assert_int_equal(tctx, r.in.type, type, "type mismatch");
+               torture_assert_data_blob_equal(tctx, blob, data.binary, "data mismatch");
+
+               if (!test_EnumPrinterDataEx(tctx, p, handle, r.in.key_name)) {
+                       return false;
+               }
+
+               if (!test_DeletePrinterDataEx(tctx, p, handle, r.in.key_name, value_name)) {
+                       return false;
+               }
+
+               c = strchr(key, '\\');
+               if (c) {
+                       int i;
+
+                       /* we have subkeys */
+
+                       *c = 0;
+
+                       if (!test_EnumPrinterKey(tctx, p, handle, key, &subkeys)) {
+                               return false;
+                       }
+
+                       for (i=0; subkeys && subkeys[i]; i++) {
+
+                               const char *current_key = talloc_asprintf(tctx, "%s\\%s", key, subkeys[i]);
+
+                               if (!test_DeletePrinterKey(tctx, p, handle, current_key)) {
+                                       return false;
+                               }
+                       }
+
+                       if (!test_DeletePrinterKey(tctx, p, handle, key)) {
+                               return false;
+                       }
+
+               } else {
+                       if (!test_DeletePrinterKey(tctx, p, handle, key)) {
+                               return false;
+                       }
+               }
        }
 
        return true;
 }
 
-static bool test_SecondaryClosePrinter(struct torture_context *tctx, 
-                                      struct dcerpc_pipe *p, 
+
+static bool test_SecondaryClosePrinter(struct torture_context *tctx,
+                                      struct dcerpc_pipe *p,
                                       struct policy_handle *handle)
 {
        NTSTATUS status;
@@ -1337,7 +2568,7 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx,
        torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NET_WRITE_FAULT,
                        "ERROR: Allowed close on secondary connection");
 
-       torture_assert_int_equal(tctx, p2->last_fault_code, DCERPC_FAULT_CONTEXT_MISMATCH, 
+       torture_assert_int_equal(tctx, p2->last_fault_code, DCERPC_FAULT_CONTEXT_MISMATCH,
                                 "Unexpected fault code");
 
        talloc_free(p2);
@@ -1345,7 +2576,7 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx,
        return true;
 }
 
-static bool test_OpenPrinter_badname(struct torture_context *tctx, 
+static bool test_OpenPrinter_badname(struct torture_context *tctx,
                                     struct dcerpc_pipe *p, const char *name)
 {
        NTSTATUS status;
@@ -1397,8 +2628,8 @@ static bool test_OpenPrinter_badname(struct torture_context *tctx,
        return ret;
 }
 
-static bool test_OpenPrinter(struct torture_context *tctx, 
-                            struct dcerpc_pipe *p, 
+static bool test_OpenPrinter(struct torture_context *tctx,
+                            struct dcerpc_pipe *p,
                             const char *name)
 {
        NTSTATUS status;
@@ -1424,8 +2655,10 @@ static bool test_OpenPrinter(struct torture_context *tctx,
                ret = false;
        }
 
-       if (!test_SecondaryClosePrinter(tctx, p, &handle)) {
-               ret = false;
+       if (!torture_setting_bool(tctx, "samba3", false)) {
+               if (!test_SecondaryClosePrinter(tctx, p, &handle)) {
+                       ret = false;
+               }
        }
 
        if (!test_ClosePrinter(tctx, p, &handle)) {
@@ -1435,8 +2668,8 @@ static bool test_OpenPrinter(struct torture_context *tctx,
        return ret;
 }
 
-static bool call_OpenPrinterEx(struct torture_context *tctx, 
-                              struct dcerpc_pipe *p, 
+static bool call_OpenPrinterEx(struct torture_context *tctx,
+                              struct dcerpc_pipe *p,
                               const char *name, struct policy_handle *handle)
 {
        struct spoolss_OpenPrinterEx r;
@@ -1444,10 +2677,10 @@ static bool call_OpenPrinterEx(struct torture_context *tctx,
        NTSTATUS status;
 
        if (name && name[0]) {
-               r.in.printername = talloc_asprintf(tctx, "\\\\%s\\%s", 
+               r.in.printername = talloc_asprintf(tctx, "\\\\%s\\%s",
                                                   dcerpc_server_name(p), name);
        } else {
-               r.in.printername = talloc_asprintf(tctx, "\\\\%s", 
+               r.in.printername = talloc_asprintf(tctx, "\\\\%s",
                                                   dcerpc_server_name(p));
        }
 
@@ -1471,14 +2704,14 @@ static bool call_OpenPrinterEx(struct torture_context *tctx,
        status = dcerpc_spoolss_OpenPrinterEx(p, tctx, &r);
 
        torture_assert_ntstatus_ok(tctx, status, "OpenPrinterEx failed");
-       
+
        torture_assert_werr_ok(tctx, r.out.result, "OpenPrinterEx failed");
 
        return true;
 }
 
-static bool test_OpenPrinterEx(struct torture_context *tctx, 
-                              struct dcerpc_pipe *p, 
+static bool test_OpenPrinterEx(struct torture_context *tctx,
+                              struct dcerpc_pipe *p,
                               const char *name)
 {
        struct policy_handle handle;
@@ -1504,7 +2737,11 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
                ret = false;
        }
 
-       if (!test_EnumPrinterDataEx(tctx, p, &handle)) {
+       if (!test_EnumPrinterDataEx(tctx, p, &handle, "PrinterDriverData")) {
+               ret = false;
+       }
+
+       if (!test_printer_keys(tctx, p, &handle)) {
                ret = false;
        }
 
@@ -1524,14 +2761,20 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
                ret = false;
        }
 
-       if (!test_SecondaryClosePrinter(tctx, p, &handle)) {
+       if (!test_SetPrinterDataEx(tctx, p, &handle)) {
                ret = false;
        }
 
+       if (!torture_setting_bool(tctx, "samba3", false)) {
+               if (!test_SecondaryClosePrinter(tctx, p, &handle)) {
+                       ret = false;
+               }
+       }
+
        if (!test_ClosePrinter(tctx, p, &handle)) {
                ret = false;
        }
-       
+
        return ret;
 }
 
@@ -1546,12 +2789,17 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                union spoolss_PrinterInfo *info;
                int j;
+               uint32_t needed;
+               uint32_t count;
 
                r.in.flags      = PRINTER_ENUM_LOCAL;
                r.in.server     = "";
                r.in.level      = levels[i];
                r.in.buffer     = NULL;
                r.in.offered    = 0;
+               r.out.needed    = &needed;
+               r.out.count     = &count;
+               r.out.info      = &info;
 
                torture_comment(tctx, "Testing EnumPrinters level %u\n", r.in.level);
 
@@ -1559,10 +2807,10 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi
                torture_assert_ntstatus_ok(tctx, status, "EnumPrinters failed");
 
                if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, r.out.needed);
+                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
                        data_blob_clear(&blob);
                        r.in.buffer = &blob;
-                       r.in.offered = r.out.needed;
+                       r.in.offered = needed;
                        status = dcerpc_spoolss_EnumPrinters(p, tctx, &r);
                }
 
@@ -1570,19 +2818,24 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrinters failed");
 
-               if (!r.out.info) {
+               if (!info) {
                        torture_comment(tctx, "No printers returned\n");
                        return true;
                }
 
-               info = r.out.info;
-
-               for (j=0;j<r.out.count;j++) {
+               for (j=0;j<count;j++) {
                        if (r.in.level == 1) {
-                               /* the names appear to be comma-separated name lists? */
-                               char *name = talloc_strdup(tctx, info[j].info1.name);
-                               char *comma = strchr(name, ',');
-                               if (comma) *comma = 0;
+                               char *unc = talloc_strdup(tctx, info[j].info1.name);
+                               char *slash, *name;
+                               name = unc;
+                               if (unc[0] == '\\' && unc[1] == '\\') {
+                                       unc +=2;
+                               }
+                               slash = strchr(unc, '\\');
+                               if (slash) {
+                                       slash++;
+                                       name = slash;
+                               }
                                if (!test_OpenPrinter(tctx, p, name)) {
                                        ret = false;
                                }
@@ -1596,13 +2849,49 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi
        return ret;
 }
 
-#if 0
-static bool test_GetPrinterDriver2(struct dcerpc_pipe *p, 
-                                  struct policy_handle *handle, 
+static bool test_GetPrinterDriver(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p,
+                                 struct policy_handle *handle,
+                                 const char *driver_name)
+{
+       struct spoolss_GetPrinterDriver r;
+       uint32_t needed;
+
+       r.in.handle = handle;
+       r.in.architecture = "W32X86";
+       r.in.level = 1;
+       r.in.buffer = NULL;
+       r.in.offered = 0;
+       r.out.needed = &needed;
+
+       torture_comment(tctx, "Testing GetPrinterDriver level %d\n", r.in.level);
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver(p, tctx, &r),
+               "failed to call GetPrinterDriver");
+       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+               data_blob_clear(&blob);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver(p, tctx, &r),
+                       "failed to call GetPrinterDriver");
+       }
+
+       torture_assert_werr_ok(tctx, r.out.result,
+               "failed to call GetPrinterDriver");
+
+       return true;
+}
+
+static bool test_GetPrinterDriver2(struct torture_context *tctx,
+                                  struct dcerpc_pipe *p,
+                                  struct policy_handle *handle,
                                   const char *driver_name)
 {
-       NTSTATUS status;
        struct spoolss_GetPrinterDriver2 r;
+       uint32_t needed;
+       uint32_t server_major_version;
+       uint32_t server_minor_version;
 
        r.in.handle = handle;
        r.in.architecture = "W32X86";
@@ -1611,37 +2900,30 @@ static bool test_GetPrinterDriver2(struct dcerpc_pipe *p,
        r.in.offered = 0;
        r.in.client_major_version = 0;
        r.in.client_minor_version = 0;
+       r.out.needed = &needed;
+       r.out.server_major_version = &server_major_version;
+       r.out.server_minor_version = &server_minor_version;
 
-       printf("Testing GetPrinterDriver2\n");
-
-       status = dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("GetPrinterDriver2 failed - %s\n", nt_errstr(status));
-               return false;
-       }
+       torture_comment(tctx, "Testing GetPrinterDriver2 level %d\n", r.in.level);
 
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r),
+               "failed to call GetPrinterDriver2");
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               r.in.offered = r.out.needed;
-               status = dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r);
-       }
-               
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("GetPrinterDriver2 failed - %s\n", 
-                      nt_errstr(status));
-               return false;
+               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+               data_blob_clear(&blob);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r),
+                       "failed to call GetPrinterDriver2");
        }
 
-       if (!W_ERROR_IS_OK(r.out.result)) {
-               printf("GetPrinterDriver2 failed - %s\n", 
-                      win_errstr(r.out.result));
-               return false;
-       }
+       torture_assert_werr_ok(tctx, r.out.result,
+               "failed to call GetPrinterDriver2");
 
        return true;
 }
-#endif
 
-static bool test_EnumPrinterDrivers_old(struct torture_context *tctx, 
+static bool test_EnumPrinterDrivers_old(struct torture_context *tctx,
                                        struct dcerpc_pipe *p)
 {
        struct spoolss_EnumPrinterDrivers r;
@@ -1651,11 +2933,18 @@ static bool test_EnumPrinterDrivers_old(struct torture_context *tctx,
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
 
+               uint32_t needed;
+               uint32_t count;
+               union spoolss_DriverInfo *info;
+
                r.in.server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
-               r.in.environment = "Windows NT x86";
+               r.in.environment = SPOOLSS_ARCHITECTURE_NT_X86;
                r.in.level = levels[i];
                r.in.buffer = NULL;
                r.in.offered = 0;
+               r.out.needed = &needed;
+               r.out.count = &count;
+               r.out.info = &info;
 
                torture_comment(tctx, "Testing EnumPrinterDrivers level %u\n", r.in.level);
 
@@ -1664,10 +2953,10 @@ static bool test_EnumPrinterDrivers_old(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "EnumPrinterDrivers failed");
 
                if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, r.out.needed);
+                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
                        data_blob_clear(&blob);
                        r.in.buffer = &blob;
-                       r.in.offered = r.out.needed;
+                       r.in.offered = needed;
                        status = dcerpc_spoolss_EnumPrinterDrivers(p, tctx, &r);
                }
 
@@ -1675,7 +2964,7 @@ static bool test_EnumPrinterDrivers_old(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDrivers failed");
 
-               if (!r.out.info) {
+               if (!info) {
                        torture_comment(tctx, "No printer drivers returned\n");
                        break;
                }
@@ -1684,41 +2973,515 @@ static bool test_EnumPrinterDrivers_old(struct torture_context *tctx,
        return true;
 }
 
-/** Test that makes sure that calling ReplyOpenPrinter()
- * on Samba 4 will cause an irpc broadcast call.
- */
-static bool test_ReplyOpenPrinter(struct torture_context *tctx, 
-                                 struct dcerpc_pipe *pipe)
+static bool test_DeletePrinter(struct torture_context *tctx,
+                              struct dcerpc_pipe *p,
+                              struct policy_handle *handle)
 {
-       struct spoolss_ReplyOpenPrinter r;
-       struct spoolss_ReplyClosePrinter s;
-       struct policy_handle h;
+       struct spoolss_DeletePrinter r;
 
-       r.in.server_name = "earth";
-       r.in.printer_local = 2;
-       r.in.type = REG_DWORD;
-       r.in.unknown1 = 0;
-       r.in.unknown2 = 0;
-       r.out.handle = &h;
+       torture_comment(tctx, "Testing DeletePrinter\n");
 
-       torture_assert_ntstatus_ok(tctx, 
-                       dcerpc_spoolss_ReplyOpenPrinter(pipe, tctx, &r),
-                       "spoolss_ReplyOpenPrinter call failed");
+       r.in.handle = handle;
 
-       torture_assert_werr_ok(tctx, r.out.result, "error return code");
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_DeletePrinter(p, tctx, &r),
+               "failed to delete printer");
+       torture_assert_werr_ok(tctx, r.out.result,
+               "failed to delete printer");
 
-       s.in.handle = &h;
-       s.out.handle = &h;
+       return true;
+}
 
-       torture_assert_ntstatus_ok(tctx,
-                       dcerpc_spoolss_ReplyClosePrinter(pipe, tctx, &s),
-                       "spoolss_ReplyClosePrinter call failed");
+static bool test_EnumPrinters_findname(struct torture_context *tctx,
+                                      struct dcerpc_pipe *p,
+                                      uint32_t flags,
+                                      uint32_t level,
+                                      const char *name,
+                                      bool *found)
+{
+       struct spoolss_EnumPrinters e;
+       uint32_t count;
+       union spoolss_PrinterInfo *info;
+       uint32_t needed;
+       int i;
+
+       *found = false;
 
-       torture_assert_werr_ok(tctx, r.out.result, "error return code");
+       e.in.flags = flags;
+       e.in.server = NULL;
+       e.in.level = level;
+       e.in.buffer = NULL;
+       e.in.offered = 0;
+       e.out.count = &count;
+       e.out.info = &info;
+       e.out.needed = &needed;
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinters(p, tctx, &e),
+               "failed to enum printers");
+
+       if (W_ERROR_EQUAL(e.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+               data_blob_clear(&blob);
+               e.in.buffer = &blob;
+               e.in.offered = needed;
+
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinters(p, tctx, &e),
+                       "failed to enum printers");
+       }
+
+       torture_assert_werr_ok(tctx, e.out.result,
+               "failed to enum printers");
+
+       for (i=0; i < count; i++) {
+
+               const char *current = NULL;
+
+               switch (level) {
+               case 1:
+                       current = info[i].info1.name;
+                       break;
+               }
+
+               if (strequal(current, name)) {
+                       *found = true;
+                       break;
+               }
+       }
+
+       return true;
+}
+
+static bool test_AddPrinter_wellknown(struct torture_context *tctx,
+                                     struct dcerpc_pipe *p,
+                                     const char *printername,
+                                     bool ex)
+{
+       WERROR result;
+       struct spoolss_AddPrinter r;
+       struct spoolss_AddPrinterEx rex;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_SetPrinterInfo1 info1;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+       struct spoolss_UserLevelCtr userlevel_ctr;
+       struct policy_handle handle;
+       bool found = false;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+       ZERO_STRUCT(userlevel_ctr);
+       ZERO_STRUCT(info1);
+
+       torture_comment(tctx, "Testing AddPrinter%s level 1\n", ex ? "Ex":"");
+
+       /* try to add printer to wellknown printer list (level 1) */
+
+       userlevel_ctr.level = 1;
+
+       info_ctr.info.info1 = &info1;
+       info_ctr.level = 1;
+
+       rex.in.server = NULL;
+       rex.in.info_ctr = &info_ctr;
+       rex.in.devmode_ctr = &devmode_ctr;
+       rex.in.secdesc_ctr = &secdesc_ctr;
+       rex.in.userlevel_ctr = &userlevel_ctr;
+       rex.out.handle = &handle;
+
+       r.in.server = NULL;
+       r.in.info_ctr = &info_ctr;
+       r.in.devmode_ctr = &devmode_ctr;
+       r.in.secdesc_ctr = &secdesc_ctr;
+       r.out.handle = &handle;
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_equal(tctx, result, WERR_INVALID_PRINTER_NAME,
+               "unexpected result code");
+
+       info1.name = printername;
+       info1.flags = PRINTER_ATTRIBUTE_SHARED;
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_equal(tctx, result, WERR_PRINTER_ALREADY_EXISTS,
+               "unexpected result code");
+
+       /* bizarre protocol, WERR_PRINTER_ALREADY_EXISTS means success here,
+          better do a real check to see the printer is really there */
+
+       torture_assert(tctx, test_EnumPrinters_findname(tctx, p,
+                                                       PRINTER_ENUM_NETWORK, 1,
+                                                       printername,
+                                                       &found),
+                       "failed to enum printers");
+
+       torture_assert(tctx, found, "failed to find newly added printer");
+
+       info1.flags = 0;
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_equal(tctx, result, WERR_PRINTER_ALREADY_EXISTS,
+               "unexpected result code");
+
+       /* bizarre protocol, WERR_PRINTER_ALREADY_EXISTS means success here,
+          better do a real check to see the printer has really been removed
+          from the well known printer list */
+
+       found = false;
+
+       torture_assert(tctx, test_EnumPrinters_findname(tctx, p,
+                                                       PRINTER_ENUM_NETWORK, 1,
+                                                       printername,
+                                                       &found),
+                       "failed to enum printers");
+#if 0
+       torture_assert(tctx, !found, "printer still in well known printer list");
+#endif
+       return true;
+}
+
+static bool test_AddPrinter_normal(struct torture_context *tctx,
+                                  struct dcerpc_pipe *p,
+                                  struct policy_handle *handle_p,
+                                  const char *printername,
+                                  const char *drivername,
+                                  const char *portname,
+                                  bool ex)
+{
+       WERROR result;
+       struct spoolss_AddPrinter r;
+       struct spoolss_AddPrinterEx rex;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_SetPrinterInfo2 info2;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+       struct spoolss_UserLevelCtr userlevel_ctr;
+       struct policy_handle handle;
+       bool found = false;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+       ZERO_STRUCT(userlevel_ctr);
+
+       torture_comment(tctx, "Testing AddPrinter%s level 2\n", ex ? "Ex":"");
+
+       userlevel_ctr.level = 1;
+
+       rex.in.server = NULL;
+       rex.in.info_ctr = &info_ctr;
+       rex.in.devmode_ctr = &devmode_ctr;
+       rex.in.secdesc_ctr = &secdesc_ctr;
+       rex.in.userlevel_ctr = &userlevel_ctr;
+       rex.out.handle = &handle;
+
+       r.in.server = NULL;
+       r.in.info_ctr = &info_ctr;
+       r.in.devmode_ctr = &devmode_ctr;
+       r.in.secdesc_ctr = &secdesc_ctr;
+       r.out.handle = &handle;
+
+ again:
+
+       /* try to add printer to printer list (level 2) */
+
+       ZERO_STRUCT(info2);
+
+       info_ctr.info.info2 = &info2;
+       info_ctr.level = 2;
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_equal(tctx, result, WERR_INVALID_PRINTER_NAME,
+               "unexpected result code");
+
+       info2.printername = printername;
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+
+       if (W_ERROR_EQUAL(result, WERR_PRINTER_ALREADY_EXISTS)) {
+               struct policy_handle printer_handle;
+
+               torture_assert(tctx, call_OpenPrinterEx(tctx, p, printername, &printer_handle),
+                       "failed to open printer handle");
+
+               torture_assert(tctx, test_DeletePrinter(tctx, p, &printer_handle),
+                       "failed to delete printer");
+
+               torture_assert(tctx, test_ClosePrinter(tctx, p, &printer_handle),
+                       "failed to close server handle");
+
+               goto again;
+       }
+
+       torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PORT,
+               "unexpected result code");
+
+       info2.portname = portname;
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PRINTER_DRIVER,
+               "unexpected result code");
+
+       info2.drivername = drivername;
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PRINTPROCESSOR,
+               "unexpected result code");
+
+       info2.printprocessor = "winprint";
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_ok(tctx, result,
+               "failed to add printer");
+
+       *handle_p = handle;
+
+       /* we are paranoid, really check if the printer is there now */
+
+       torture_assert(tctx, test_EnumPrinters_findname(tctx, p,
+                                                       PRINTER_ENUM_LOCAL, 1,
+                                                       printername,
+                                                       &found),
+                       "failed to enum printers");
+       torture_assert(tctx, found, "failed to find newly added printer");
+
+       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+       torture_assert_werr_equal(tctx, result, WERR_PRINTER_ALREADY_EXISTS,
+               "unexpected result code");
 
        return true;
 }
 
+static bool test_AddPrinterEx(struct torture_context *tctx,
+                             struct dcerpc_pipe *p,
+                             struct policy_handle *handle_p,
+                             const char *printername,
+                             const char *drivername,
+                             const char *portname)
+{
+       bool ret = true;
+
+       if (!torture_setting_bool(tctx, "samba3", false)) {
+               if (!test_AddPrinter_wellknown(tctx, p, TORTURE_WELLKNOWN_PRINTER_EX, true)) {
+                       torture_comment(tctx, "failed to add printer to well known list\n");
+                       ret = false;
+               }
+       }
+
+       if (!test_AddPrinter_normal(tctx, p, handle_p,
+                                   printername, drivername, portname,
+                                   true)) {
+               torture_comment(tctx, "failed to add printer to printer list\n");
+               ret = false;
+       }
+
+       return ret;
+}
+
+static bool test_AddPrinter(struct torture_context *tctx,
+                           struct dcerpc_pipe *p,
+                           struct policy_handle *handle_p,
+                           const char *printername,
+                           const char *drivername,
+                           const char *portname)
+{
+       bool ret = true;
+
+       if (!torture_setting_bool(tctx, "samba3", false)) {
+               if (!test_AddPrinter_wellknown(tctx, p, TORTURE_WELLKNOWN_PRINTER, false)) {
+                       torture_comment(tctx, "failed to add printer to well known list\n");
+                       ret = false;
+               }
+       }
+
+       if (!test_AddPrinter_normal(tctx, p, handle_p,
+                                   printername, drivername, portname,
+                                   false)) {
+               torture_comment(tctx, "failed to add printer to printer list\n");
+               ret = false;
+       }
+
+       return ret;
+}
+
+static bool test_printer_info(struct torture_context *tctx,
+                             struct dcerpc_pipe *p,
+                             struct policy_handle *handle)
+{
+       bool ret = true;
+
+       if (!test_PrinterInfo(tctx, p, handle)) {
+               ret = false;
+       }
+
+       if (!test_SetPrinter_errors(tctx, p, handle)) {
+               ret = false;
+       }
+
+       return ret;
+}
+
+static bool test_EnumPrinterKey(struct torture_context *tctx,
+                               struct dcerpc_pipe *p,
+                               struct policy_handle *handle,
+                               const char *key_name,
+                               const char ***array)
+{
+       struct spoolss_EnumPrinterKey r;
+       uint32_t needed;
+       struct spoolss_StringArray2 key_buffer;
+       uint32_t offered[] = { 0, 512, 1024, 2048 };
+       int i;
+
+       r.in.handle = handle;
+       r.in.key_name = key_name;
+       r.out.key_buffer = &key_buffer;
+       r.out.needed = &needed;
+
+       for (i=0; i < ARRAY_SIZE(offered); i++) {
+               r.in.offered = offered[i];
+
+               torture_comment(tctx, "Testing EnumPrinterKey(%s) with %d offered\n", r.in.key_name, r.in.offered);
+
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey(p, tctx, &r),
+                       "failed to call EnumPrinterKey");
+               if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
+                       torture_assert(tctx, (key_buffer._ndr_size == 0),
+                               talloc_asprintf(tctx, "EnumPrinterKey did not return 0 _ndr_size (but %d), windows clients would abort here!", key_buffer._ndr_size));
+                       r.in.offered = needed;
+                       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey(p, tctx, &r),
+                               "failed to call EnumPrinterKey");
+               }
+               torture_assert_werr_ok(tctx, r.out.result,
+                       "failed to call EnumPrinterKey");
+
+               torture_assert(tctx, (key_buffer._ndr_size * 2 == r.in.offered),
+                       talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
+                               key_buffer._ndr_size, r.in.offered/2));
+
+               torture_assert(tctx, (*r.out.needed <= r.in.offered),
+                       talloc_asprintf(tctx, "EnumPrinterKey size mismatch: needed %d is not <= offered %d", *r.out.needed, r.in.offered));
+
+               torture_assert(tctx, (*r.out.needed <= key_buffer._ndr_size * 2),
+                       talloc_asprintf(tctx, "EnumPrinterKey size mismatch: needed %d is not <= _ndr_size %d * 2", *r.out.needed, key_buffer._ndr_size));
+
+       }
+
+       if (array) {
+               *array = key_buffer.string;
+       }
+
+       return true;
+}
+
+bool test_printer_keys(struct torture_context *tctx,
+                      struct dcerpc_pipe *p,
+                      struct policy_handle *handle)
+{
+       const char **key_array = NULL;
+       int i;
+
+       torture_assert(tctx, test_EnumPrinterKey(tctx, p, handle, "", &key_array),
+               "failed to call test_EnumPrinterKey");
+
+       for (i=0; key_array && key_array[i]; i++) {
+               torture_assert(tctx, test_EnumPrinterKey(tctx, p, handle, key_array[i], NULL),
+                       "failed to call test_EnumPrinterKey");
+       }
+       for (i=0; key_array && key_array[i]; i++) {
+               torture_assert(tctx, test_EnumPrinterDataEx(tctx, p, handle, key_array[i]),
+                       "failed to call test_EnumPrinterDataEx");
+       }
+
+       return true;
+}
+
+static bool test_printer(struct torture_context *tctx,
+                        struct dcerpc_pipe *p)
+{
+       bool ret = true;
+       struct policy_handle handle[2];
+       bool found = false;
+       const char *drivername = "Microsoft XPS Document Writer";
+       const char *portname = "LPT1:";
+
+       /* test printer created via AddPrinter */
+
+       if (!test_AddPrinter(tctx, p, &handle[0], TORTURE_PRINTER, drivername, portname)) {
+               return false;
+       }
+
+       if (!test_printer_info(tctx, p, &handle[0])) {
+               ret = false;
+       }
+
+       if (!test_printer_keys(tctx, p, &handle[0])) {
+               ret = false;
+       }
+
+       if (!test_DeletePrinter(tctx, p, &handle[0])) {
+               ret = false;
+       }
+
+       if (!test_EnumPrinters_findname(tctx, p, PRINTER_ENUM_LOCAL, 1,
+                                       TORTURE_PRINTER, &found)) {
+               ret = false;
+       }
+
+       torture_assert(tctx, !found, "deleted printer still there");
+
+       /* test printer created via AddPrinterEx */
+
+       if (!test_AddPrinterEx(tctx, p, &handle[1], TORTURE_PRINTER_EX, drivername, portname)) {
+               return false;
+       }
+
+       if (!test_printer_info(tctx, p, &handle[1])) {
+               ret = false;
+       }
+
+       if (!test_printer_keys(tctx, p, &handle[1])) {
+               ret = false;
+       }
+
+       if (!test_DeletePrinter(tctx, p, &handle[1])) {
+               ret = false;
+       }
+
+       if (!test_EnumPrinters_findname(tctx, p, PRINTER_ENUM_LOCAL, 1,
+                                       TORTURE_PRINTER_EX, &found)) {
+               ret = false;
+       }
+
+       torture_assert(tctx, !found, "deleted printer still there");
+
+       return ret;
+}
+
 bool torture_rpc_spoolss(struct torture_context *torture)
 {
        NTSTATUS status;
@@ -1733,28 +3496,18 @@ bool torture_rpc_spoolss(struct torture_context *torture)
 
        ctx = talloc_zero(torture, struct test_spoolss_context);
 
-       ret &= test_OpenPrinter_server(torture, p, ctx);
-
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "W3SvcInstalled");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "BeepEnabled");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "EventLog");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopup");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopupToComputer");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "MajorVersion");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "MinorVersion");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DefaultSpoolDirectory");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "Architecture");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DsPresent");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersion");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersionEx");
-       ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DNSMachineName");
+       ret &= test_OpenPrinter_server(torture, p, &ctx->server_handle);
+       ret &= test_GetPrinterData_list(torture, p, &ctx->server_handle);
        ret &= test_EnumForms(torture, p, &ctx->server_handle, true);
        ret &= test_AddForm(torture, p, &ctx->server_handle, true);
        ret &= test_EnumPorts(torture, p, ctx);
        ret &= test_GetPrinterDriverDirectory(torture, p, ctx);
-       ret &= test_EnumPrinterDrivers(torture, p, ctx);
+       ret &= test_GetPrintProcessorDirectory(torture, p, ctx);
+       ret &= test_EnumPrinterDrivers(torture, p, ctx, SPOOLSS_ARCHITECTURE_NT_X86);
+       ret &= test_EnumPrinterDrivers(torture, p, ctx, SPOOLSS_ARCHITECTURE_ALL);
        ret &= test_EnumMonitors(torture, p, ctx);
        ret &= test_EnumPrintProcessors(torture, p, ctx);
+       ret &= test_EnumPrintProcDataTypes(torture, p, ctx);
        ret &= test_EnumPrinters(torture, p, ctx);
        ret &= test_OpenPrinter_badname(torture, p, "__INVALID_PRINTER__");
        ret &= test_OpenPrinter_badname(torture, p, "\\\\__INVALID_HOST__");
@@ -1762,7 +3515,7 @@ bool torture_rpc_spoolss(struct torture_context *torture)
        ret &= test_OpenPrinter_badname(torture, p, "\\\\\\");
        ret &= test_OpenPrinter_badname(torture, p, "\\\\\\__INVALID_PRINTER__");
        ret &= test_OpenPrinter_badname(torture, p, talloc_asprintf(torture, "\\\\%s\\", dcerpc_server_name(p)));
-       ret &= test_OpenPrinter_badname(torture, p, 
+       ret &= test_OpenPrinter_badname(torture, p,
                                        talloc_asprintf(torture, "\\\\%s\\__INVALID_PRINTER__", dcerpc_server_name(p)));
 
 
@@ -1770,7 +3523,18 @@ bool torture_rpc_spoolss(struct torture_context *torture)
        ret &= test_EnumPorts_old(torture, p);
        ret &= test_EnumPrinters_old(torture, p);
        ret &= test_EnumPrinterDrivers_old(torture, p);
-       ret &= test_ReplyOpenPrinter(torture, p);
 
        return ret;
 }
+
+struct torture_suite *torture_rpc_spoolss_printer(TALLOC_CTX *mem_ctx)
+{
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS-PRINTER");
+
+       struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
+                                                       "printer", &ndr_table_spoolss);
+
+       torture_rpc_tcase_add_test(tcase, "printer", test_printer);
+
+       return suite;
+}