s4-smbtorture: only run the cupsaddsmb adobe driver test against s3.
[kai/samba.git] / source4 / torture / rpc / spoolss.c
index 05ee57268c18d972b2f87530967e1c92d0fcb29c..dfd1c7ee33b99dc8c1ef7c2a35a35539533db31b 100644 (file)
 #include "librpc/gen_ndr/ndr_winreg_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
 #include "param/param.h"
 #include "lib/registry/registry.h"
+#include "libcli/libcli.h"
+#include "libcli/raw/raw_proto.h"
+#include "libcli/resolve/resolve.h"
+#include "lib/cmdline/popt_common.h"
+#include "system/filesys.h"
+#include "torture/ndr/ndr.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"
+#define TORTURE_DRIVER                 "torture_driver"
+#define TORTURE_DRIVER_EX              "torture_driver_ex"
+#define TORTURE_DRIVER_ADOBE           "torture_driver_adobe"
+#define TORTURE_DRIVER_EX_ADOBE                "torture_driver_ex_adobe"
+#define TORTURE_DRIVER_ADOBE_CUPSADDSMB        "torture_driver_adobe_cupsaddsmb"
 
 #define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
 #define TOP_LEVEL_PRINT_PRINTERS_KEY TOP_LEVEL_PRINT_KEY "\\Printers"
 #define TOP_LEVEL_CONTROL_KEY "SYSTEM\\CurrentControlSet\\Control\\Print"
 #define TOP_LEVEL_CONTROL_FORMS_KEY TOP_LEVEL_CONTROL_KEY "\\Forms"
+#define TOP_LEVEL_CONTROL_PRINTERS_KEY TOP_LEVEL_CONTROL_KEY "\\Printers"
+#define TOP_LEVEL_CONTROL_ENVIRONMENTS_KEY TOP_LEVEL_CONTROL_KEY "\\Environments"
 
 struct test_spoolss_context {
+       struct dcerpc_pipe *spoolss_pipe;
+
+       /* server environment */
+       const char *environment;
+
        /* print server handle */
        struct policy_handle server_handle;
 
@@ -68,6 +86,47 @@ struct test_spoolss_context {
        union spoolss_PrinterInfo *printers[6];
 };
 
+struct torture_driver_context {
+       struct {
+               const char *driver_directory;
+               const char *environment;
+       } local;
+       struct {
+               const char *driver_directory;
+               const char *environment;
+       } remote;
+       struct spoolss_AddDriverInfo8 info8;
+       bool ex;
+};
+
+struct torture_printer_context {
+       struct dcerpc_pipe *spoolss_pipe;
+       struct spoolss_SetPrinterInfo2 info2;
+       struct torture_driver_context driver;
+       bool ex;
+       bool wellknown;
+       bool added_driver;
+       bool have_driver;
+       struct spoolss_DeviceMode *devmode;
+       struct policy_handle handle;
+};
+
+static bool upload_printer_driver(struct torture_context *tctx,
+                                 const char *server_name,
+                                 struct torture_driver_context *d);
+static bool remove_printer_driver(struct torture_context *tctx,
+                                 const char *server_name,
+                                 struct torture_driver_context *d);
+static bool fillup_printserver_info(struct torture_context *tctx,
+                                   struct dcerpc_pipe *p,
+                                   struct torture_driver_context *d);
+static bool test_AddPrinterDriver_args_level_3(struct torture_context *tctx,
+                                              struct dcerpc_binding_handle *b,
+                                              const char *server_name,
+                                              struct spoolss_AddDriverInfo8 *r,
+                                              uint32_t flags,
+                                              bool ex);
+
 #define COMPARE_STRING(tctx, c,r,e) \
        torture_assert_str_equal(tctx, c.e, r.e, "invalid value")
 
@@ -126,9 +185,9 @@ struct test_spoolss_context {
 
 #define DO_ROUND(size, n) (((size)+((n)-1)) & ~((n)-1))
 
-#define CHECK_NEEDED_SIZE_ENUM_LEVEL(fn, info, level, count, ic, needed, align) do { \
+#define CHECK_NEEDED_SIZE_ENUM_LEVEL(fn, info, level, count, needed, align) do { \
        if (torture_setting_bool(tctx, "spoolss_check_size", false)) {\
-       uint32_t size = ndr_size_##fn##_info(tctx, ic, level, count, info);\
+       uint32_t size = ndr_size_##fn##_info(tctx, level, count, info);\
        uint32_t round_size = DO_ROUND(size, align);\
        if (round_size != needed) {\
                torture_warning(tctx, __location__": "#fn" level %d (count: %d) got unexpected needed size: %d, we calculated: %d", level, count, needed, round_size);\
@@ -137,9 +196,9 @@ struct test_spoolss_context {
        }\
 } while(0)
 
-#define CHECK_NEEDED_SIZE_ENUM(fn, info, count, ic, needed, align) do { \
+#define CHECK_NEEDED_SIZE_ENUM(fn, info, count, needed, align) do { \
        if (torture_setting_bool(tctx, "spoolss_check_size", false)) {\
-       uint32_t size = ndr_size_##fn##_info(tctx, ic, count, info);\
+       uint32_t size = ndr_size_##fn##_info(tctx, count, info);\
        uint32_t round_size = DO_ROUND(size, align);\
        if (round_size != needed) {\
                torture_warning(tctx, __location__": "#fn" (count: %d) got unexpected needed size: %d, we calculated: %d", count, needed, round_size);\
@@ -148,9 +207,9 @@ struct test_spoolss_context {
        }\
 } while(0)
 
-#define CHECK_NEEDED_SIZE_LEVEL(fn, info, level, ic, needed, align) do { \
+#define CHECK_NEEDED_SIZE_LEVEL(fn, info, level, needed, align) do { \
        if (torture_setting_bool(tctx, "spoolss_check_size", false)) {\
-       uint32_t size = ndr_size_##fn(info, level, ic, 0);\
+       uint32_t size = ndr_size_##fn(info, level, 0);\
        uint32_t round_size = DO_ROUND(size, align);\
        if (round_size != needed) {\
                torture_warning(tctx, __location__": "#fn" level %d got unexpected needed size: %d, we calculated: %d", level, needed, round_size);\
@@ -230,9 +289,12 @@ static bool test_OpenPrinter_server(struct torture_context *tctx,
 }
 
 static bool test_EnumPorts(struct torture_context *tctx,
-                          struct dcerpc_binding_handle *b,
-                          struct test_spoolss_context *ctx)
+                          void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
        NTSTATUS status;
        struct spoolss_EnumPorts r;
        uint16_t levels[] = { 1, 2 };
@@ -264,8 +326,7 @@ static bool test_EnumPorts(struct torture_context *tctx,
                torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "EnumPorts unexpected return code");
 
-               blob = data_blob_talloc(ctx, NULL, needed);
-               data_blob_clear(&blob);
+               blob = data_blob_talloc_zero(ctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -276,7 +337,7 @@ static bool test_EnumPorts(struct torture_context *tctx,
 
                torture_assert(tctx, info, "EnumPorts returned no info");
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPorts, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPorts, info, r.in.level, count, needed, 4);
 
                ctx->port_count[level]  = count;
                ctx->ports[level]       = info;
@@ -310,10 +371,13 @@ static bool test_EnumPorts(struct torture_context *tctx,
 }
 
 static bool test_GetPrintProcessorDirectory(struct torture_context *tctx,
-                                           struct dcerpc_pipe *p,
-                                           const char *environment)
+                                           void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+
        NTSTATUS status;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
        struct dcerpc_binding_handle *b = p->binding_handle;
        struct spoolss_GetPrintProcessorDirectory r;
        struct {
@@ -344,7 +408,7 @@ static bool test_GetPrintProcessorDirectory(struct torture_context *tctx,
                DATA_BLOB blob;
 
                r.in.server             = levels[i].server;
-               r.in.environment        = environment;
+               r.in.environment        = ctx->environment;
                r.in.level              = level;
                r.in.buffer             = NULL;
                r.in.offered            = 0;
@@ -358,8 +422,7 @@ static bool test_GetPrintProcessorDirectory(struct torture_context *tctx,
                torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "GetPrintProcessorDirectory unexpected return code");
 
-               blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
+               blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -368,7 +431,7 @@ static bool test_GetPrintProcessorDirectory(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "GetPrintProcessorDirectory failed");
 
-               CHECK_NEEDED_SIZE_LEVEL(spoolss_PrintProcessorDirectoryInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 2);
+               CHECK_NEEDED_SIZE_LEVEL(spoolss_PrintProcessorDirectoryInfo, r.out.info, r.in.level, needed, 2);
        }
 
        return true;
@@ -376,10 +439,13 @@ static bool test_GetPrintProcessorDirectory(struct torture_context *tctx,
 
 
 static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
-                                          struct dcerpc_pipe *p,
-                                          const char *environment)
+                                          void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+
        NTSTATUS status;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
        struct dcerpc_binding_handle *b = p->binding_handle;
        struct spoolss_GetPrinterDriverDirectory r;
        struct {
@@ -410,7 +476,7 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
                DATA_BLOB blob;
 
                r.in.server             = levels[i].server;
-               r.in.environment        = environment;
+               r.in.environment        = ctx->environment;
                r.in.level              = level;
                r.in.buffer             = NULL;
                r.in.offered            = 0;
@@ -424,8 +490,7 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
                torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "GetPrinterDriverDirectory unexpected return code");
 
-               blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
+               blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -434,65 +499,148 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "GetPrinterDriverDirectory failed");
 
-               CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverDirectoryInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 2);
+               CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverDirectoryInfo, r.out.info, r.in.level, needed, 2);
        }
 
        return true;
 }
 
-static bool test_EnumPrinterDrivers(struct torture_context *tctx,
-                                   struct dcerpc_pipe *p,
-                                   struct test_spoolss_context *ctx,
-                                   const char *architecture)
+static bool test_EnumPrinterDrivers_args(struct torture_context *tctx,
+                                        struct dcerpc_binding_handle *b,
+                                        const char *server_name,
+                                        const char *environment,
+                                        uint32_t level,
+                                        uint32_t *count_p,
+                                        union spoolss_DriverInfo **info_p)
 {
-       NTSTATUS status;
-       struct dcerpc_binding_handle *b = p->binding_handle;
        struct spoolss_EnumPrinterDrivers r;
-       uint16_t levels[] = { 1, 2, 3, 4, 5, 6, 8 };
-       int i, j;
+       uint32_t needed;
+       uint32_t count;
+       union spoolss_DriverInfo *info;
 
-       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             = server_name;
+       r.in.environment        = environment;
+       r.in.level              = level;
+       r.in.buffer             = NULL;
+       r.in.offered            = 0;
+       r.out.needed            = &needed;
+       r.out.count             = &count;
+       r.out.info              = &info;
 
-               /* FIXME: gd, come back and fix "" as server, and handle
-                * priority of returned error codes in torture test and samba 3
-                * server */
+       torture_comment(tctx, "Testing EnumPrinterDrivers(%s) level %u\n",
+               r.in.environment, r.in.level);
 
-               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_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_EnumPrinterDrivers_r(b, tctx, &r),
+               "EnumPrinterDrivers failed");
+       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
 
-               torture_comment(tctx, "Testing EnumPrinterDrivers level %u (%s)\n", r.in.level, r.in.environment);
+               torture_assert_ntstatus_ok(tctx,
+                       dcerpc_spoolss_EnumPrinterDrivers_r(b, tctx, &r),
+                       "EnumPrinterDrivers failed");
+       }
 
-               status = dcerpc_spoolss_EnumPrinterDrivers_r(b, ctx, &r);
-               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;
-               }
-               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;
+       torture_assert_werr_ok(tctx, r.out.result,
+               "EnumPrinterDrivers failed");
+
+       if (count_p) {
+               *count_p = count;
+       }
+       if (info_p) {
+               *info_p = info;
+       }
+
+       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinterDrivers, info, r.in.level, count, needed, 4);
+
+       return true;
+
+}
+
+static bool test_EnumPrinterDrivers_findone(struct torture_context *tctx,
+                                           struct dcerpc_binding_handle *b,
+                                           const char *server_name,
+                                           const char *environment,
+                                           uint32_t level,
+                                           const char *driver_name)
+{
+       uint32_t count;
+       union spoolss_DriverInfo *info;
+       int i;
+
+       torture_assert(tctx,
+               test_EnumPrinterDrivers_args(tctx, b, server_name, environment, level, &count, &info),
+               "failed to enumerate printer drivers");
 
-                       status = dcerpc_spoolss_EnumPrinterDrivers_r(b, ctx, &r);
-                       torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrinterDrivers failed");
+       for (i=0; i < count; i++) {
+               const char *driver_name_ret;
+               switch (level) {
+               case 1:
+                       driver_name_ret = info[i].info1.driver_name;
+                       break;
+               case 2:
+                       driver_name_ret = info[i].info2.driver_name;
+                       break;
+               case 3:
+                       driver_name_ret = info[i].info3.driver_name;
+                       break;
+               case 4:
+                       driver_name_ret = info[i].info4.driver_name;
+                       break;
+               case 5:
+                       driver_name_ret = info[i].info5.driver_name;
+                       break;
+               case 6:
+                       driver_name_ret = info[i].info6.driver_name;
+                       break;
+               case 7:
+                       driver_name_ret = info[i].info7.driver_name;
+                       break;
+               case 8:
+                       driver_name_ret = info[i].info8.driver_name;
+                       break;
+               default:
+                       break;
+               }
+               if (strequal(driver_name, driver_name_ret)) {
+                       return true;
                }
+       }
+
+       return false;
+}
 
-               torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDrivers failed");
+static bool test_EnumPrinterDrivers(struct torture_context *tctx,
+                                   void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       uint16_t levels[] = { 1, 2, 3, 4, 5, 6, 8 };
+       int i, j, a;
+
+       /* FIXME: gd, come back and fix "" as server, and handle
+        * priority of returned error codes in torture test and samba 3
+        * server */
+       const char *server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+       const char *environments[2];
+
+       environments[0] = SPOOLSS_ARCHITECTURE_ALL;
+       environments[1] = ctx->environment;
+
+       for (a=0;a<ARRAY_SIZE(environments);a++) {
+
+       for (i=0;i<ARRAY_SIZE(levels);i++) {
+               int level = levels[i];
+               uint32_t count;
+               union spoolss_DriverInfo *info;
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinterDrivers, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               torture_assert(tctx,
+                       test_EnumPrinterDrivers_args(tctx, b, server_name, environments[a], level, &count, &info),
+                       "failed to enumerate drivers");
 
                ctx->driver_count[level]        = count;
                ctx->drivers[level]             = info;
@@ -586,14 +734,18 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx,
                        }
                }
        }
+       }
 
        return true;
 }
 
 static bool test_EnumMonitors(struct torture_context *tctx,
-                             struct dcerpc_binding_handle *b,
-                             struct test_spoolss_context *ctx)
+                             void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
        NTSTATUS status;
        struct spoolss_EnumMonitors r;
        uint16_t levels[] = { 1, 2 };
@@ -625,8 +777,7 @@ static bool test_EnumMonitors(struct torture_context *tctx,
                torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "EnumMonitors failed");
 
-               blob = data_blob_talloc(ctx, NULL, needed);
-               data_blob_clear(&blob);
+               blob = data_blob_talloc_zero(ctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -635,7 +786,7 @@ static bool test_EnumMonitors(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumMonitors failed");
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumMonitors, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumMonitors, info, r.in.level, count, needed, 4);
 
                ctx->monitor_count[level]       = count;
                ctx->monitors[level]            = info;
@@ -667,141 +818,196 @@ static bool test_EnumMonitors(struct torture_context *tctx,
        return true;
 }
 
-static bool test_EnumPrintProcessors(struct torture_context *tctx,
-                                    struct dcerpc_binding_handle *b,
-                                    struct test_spoolss_context *ctx,
-                                    const char *environment)
+static bool test_EnumPrintProcessors_level(struct torture_context *tctx,
+                                          struct dcerpc_binding_handle *b,
+                                          const char *environment,
+                                          uint32_t level,
+                                          uint32_t *count_p,
+                                          union spoolss_PrintProcessorInfo **info_p,
+                                          WERROR expected_result)
 {
-       NTSTATUS status;
        struct spoolss_EnumPrintProcessors r;
-       uint16_t levels[] = { 1 };
-       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_PrintProcessorInfo *info;
-
-               r.in.servername = "";
-               r.in.environment = environment;
-               r.in.level = level;
-               r.in.buffer = NULL;
-               r.in.offered = 0;
-               r.out.needed = &needed;
-               r.out.count = &count;
-               r.out.info = &info;
+       DATA_BLOB blob;
+       uint32_t needed;
+       uint32_t count;
+       union spoolss_PrintProcessorInfo *info;
 
-               torture_comment(tctx, "Testing EnumPrintProcessors level %u\n", r.in.level);
+       r.in.servername = "";
+       r.in.environment = environment;
+       r.in.level = level;
+       r.in.buffer = NULL;
+       r.in.offered = 0;
+       r.out.needed = &needed;
+       r.out.count = &count;
+       r.out.info = &info;
 
-               status = dcerpc_spoolss_EnumPrintProcessors_r(b, ctx, &r);
-               torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcessors 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,
-                       "EnumPrintProcessors unexpected return code");
+       torture_comment(tctx, "Testing EnumPrintProcessors(%s) level %u\n",
+               r.in.environment, r.in.level);
 
-               blob = data_blob_talloc(ctx, NULL, needed);
-               data_blob_clear(&blob);
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_EnumPrintProcessors_r(b, tctx, &r),
+               "EnumPrintProcessors failed");
+       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
+               torture_assert_ntstatus_ok(tctx,
+                       dcerpc_spoolss_EnumPrintProcessors_r(b, tctx, &r),
+                       "EnumPrintProcessors failed");
+       }
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "EnumPrintProcessors failed");
+
+       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcessors, info, level, count, needed, 4);
+
+       if (count_p) {
+               *count_p = count;
+       }
+       if (info_p) {
+               *info_p = info;
+       }
+
+       return true;
+}
+
+static bool test_EnumPrintProcessors(struct torture_context *tctx,
+                                    void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
 
-               status = dcerpc_spoolss_EnumPrintProcessors_r(b, ctx, &r);
-               torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcessors failed");
+       uint16_t levels[] = {0, 1, 2, 3, 32, 256 };
+       uint16_t     ok[] = {0, 1, 0, 0, 0, 0 };
+       int i;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-               torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcessors failed");
+       torture_assert(tctx,
+               test_EnumPrintProcessors_level(tctx, b, "phantasy", 1, NULL, NULL, WERR_INVALID_ENVIRONMENT),
+               "test_EnumPrintProcessors_level failed");
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcessors, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+       for (i=0;i<ARRAY_SIZE(levels);i++) {
+               union spoolss_PrintProcessorInfo *info;
+               uint32_t count;
+               WERROR expected_result = ok[i] ? WERR_OK : WERR_INVALID_LEVEL;
 
-               ctx->print_processor_count[level]       = count;
-               ctx->print_processors[level]            = info;
+               torture_assert(tctx,
+                       test_EnumPrintProcessors_level(tctx, b, ctx->environment, levels[i], &count, &info, expected_result),
+                       "test_EnumPrintProcessors_level failed");
        }
 
-       for (i=1;i<ARRAY_SIZE(levels);i++) {
-               int level = levels[i];
-               int old_level = levels[i-1];
-               torture_assert_int_equal(tctx, ctx->print_processor_count[level], ctx->print_processor_count[old_level],
-                       "EnumPrintProcessors failed");
+       return true;
+}
+
+static bool test_EnumPrintProcDataTypes_level(struct torture_context *tctx,
+                                             struct dcerpc_binding_handle *b,
+                                             const char *print_processor_name,
+                                             uint32_t level,
+                                             uint32_t *count_p,
+                                             union spoolss_PrintProcDataTypesInfo **info_p,
+                                             WERROR expected_result)
+{
+       struct spoolss_EnumPrintProcDataTypes r;
+       DATA_BLOB blob;
+       uint32_t needed;
+       uint32_t count;
+       union spoolss_PrintProcDataTypesInfo *info;
+
+       r.in.servername = "";
+       r.in.print_processor_name = print_processor_name;
+       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(%s) level %u\n",
+               r.in.print_processor_name, r.in.level);
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_EnumPrintProcDataTypes_r(b, tctx, &r),
+               "EnumPrintProcDataTypes failed");
+       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               blob = data_blob_talloc_zero(tctx, needed);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+               torture_assert_ntstatus_ok(tctx,
+                       dcerpc_spoolss_EnumPrintProcDataTypes_r(b, tctx, &r),
+                       "EnumPrintProcDataTypes failed");
        }
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "EnumPrintProcDataTypes failed");
 
-       for (i=0;i<ARRAY_SIZE(levels);i++) {
-               int level = levels[i];
-               for (j=0;j<ctx->print_processor_count[level];j++) {
-#if 0
-                       union spoolss_PrintProcessorInfo *cur = &ctx->print_processors[level][j];
-                       union spoolss_PrintProcessorInfo *ref = &ctx->print_processors[1][j];
-#endif
-                       switch (level) {
-                       case 1:
-                               /* level 1 is our reference, and it makes no sense to compare it to itself */
-                               break;
-                       }
-               }
+       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcDataTypes, info, level, count, needed, 4);
+
+       if (count_p) {
+               *count_p = count;
+       }
+       if (info_p) {
+               *info_p = info;
        }
 
        return true;
 }
 
 static bool test_EnumPrintProcDataTypes(struct torture_context *tctx,
-                                       struct dcerpc_binding_handle *b)
+                                       void *private_data)
 {
-       NTSTATUS status;
-       struct spoolss_EnumPrintProcDataTypes r;
-       uint16_t levels[] = { 1 };
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+
+       uint16_t levels[] = {0, 1, 2, 3, 32, 256 };
+       uint16_t     ok[] = {0, 1, 0, 0, 0, 0 };
        int i;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       torture_assert(tctx,
+               test_EnumPrintProcDataTypes_level(tctx, b, NULL, 1, NULL, NULL, WERR_UNKNOWN_PRINTPROCESSOR),
+               "test_EnumPrintProcDataTypes_level failed");
+
+       torture_assert(tctx,
+               test_EnumPrintProcDataTypes_level(tctx, b, "nonexisting", 1, NULL, NULL, WERR_UNKNOWN_PRINTPROCESSOR),
+               "test_EnumPrintProcDataTypes_level failed");
 
        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;
+               WERROR expected_result = ok[i] ? WERR_OK : WERR_INVALID_LEVEL;
 
-               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_r(b, tctx, &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(tctx, NULL, needed);
-               data_blob_clear(&blob);
-               r.in.buffer = &blob;
-               r.in.offered = needed;
-
-               status = dcerpc_spoolss_EnumPrintProcDataTypes_r(b, tctx, &r);
-               torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcDataTypes failed");
+               torture_assert(tctx,
+                       test_EnumPrintProcDataTypes_level(tctx, b, "winprint", level, &count, &info, expected_result),
+                       "test_EnumPrintProcDataTypes_level failed");
+       }
 
-               torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcDataTypes failed");
+       {
+               union spoolss_PrintProcessorInfo *info;
+               uint32_t count;
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcDataTypes, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               torture_assert(tctx,
+                       test_EnumPrintProcessors_level(tctx, b, ctx->environment, 1, &count, &info, WERR_OK),
+                       "test_EnumPrintProcessors_level failed");
 
+               for (i=0; i < count; i++) {
+                       torture_assert(tctx,
+                               test_EnumPrintProcDataTypes_level(tctx, b, info[i].info1.print_processor_name, 1, NULL, NULL, WERR_OK),
+                               "test_EnumPrintProcDataTypes_level failed");
+               }
        }
 
+
        return true;
 }
 
-
 static bool test_EnumPrinters(struct torture_context *tctx,
-                             struct dcerpc_binding_handle *b,
-                             struct test_spoolss_context *ctx)
+                             void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
        struct spoolss_EnumPrinters r;
        NTSTATUS status;
        uint16_t levels[] = { 0, 1, 2, 4, 5 };
@@ -834,8 +1040,7 @@ static bool test_EnumPrinters(struct torture_context *tctx,
                torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER,
                        "EnumPrinters unexpected return code");
 
-               blob = data_blob_talloc(ctx, NULL, needed);
-               data_blob_clear(&blob);
+               blob = data_blob_talloc_zero(ctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -844,7 +1049,7 @@ static bool test_EnumPrinters(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrinters failed");
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinters, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinters, info, r.in.level, count, needed, 4);
 
                ctx->printer_count[level]       = count;
                ctx->printers[level]            = info;
@@ -953,8 +1158,7 @@ bool test_GetPrinter_level(struct torture_context *tctx,
                "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);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -964,7 +1168,7 @@ bool test_GetPrinter_level(struct torture_context *tctx,
 
        torture_assert_werr_ok(tctx, r.out.result, "GetPrinter failed");
 
-       CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterInfo, r.out.info, r.in.level, needed, 4);
 
        if (info && r.out.info) {
                *info = *r.out.info;
@@ -1212,6 +1416,8 @@ static bool test_PrinterInfo(struct torture_context *tctx,
        bool ret = true;
        int i;
 
+       torture_skip(tctx, "Printer Info test is currently broken, skipping");
+
        uint32_t status_list[] = {
                /* these do not stick
                PRINTER_STATUS_PAUSED,
@@ -1315,8 +1521,7 @@ static bool test_PrinterInfo(struct torture_context *tctx,
                        break; \
                }\
                if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {\
-                       DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed); \
-                       data_blob_clear(&blob); \
+                       DATA_BLOB blob = data_blob_talloc_zero(tctx, needed); \
                        r.in.buffer = &blob; \
                        r.in.offered = needed; \
                }\
@@ -1593,16 +1798,6 @@ static bool test_PrinterInfo(struct torture_context *tctx,
        return ret;
 }
 
-#define torture_assert_sid_equal(torture_ctx,got,expected,cmt)\
-       do { struct dom_sid *__got = (got), *__expected = (expected); \
-       if (!dom_sid_equal(__got, __expected)) { \
-               torture_result(torture_ctx, TORTURE_FAIL, \
-                                          __location__": "#got" was %s, expected %s: %s", \
-                                          dom_sid_string(torture_ctx, __got), dom_sid_string(torture_ctx, __expected), cmt); \
-               return false; \
-       } \
-       } while(0)
-
 static bool test_security_descriptor_equal(struct torture_context *tctx,
                                           const struct security_descriptor *sd1,
                                           const struct security_descriptor *sd2)
@@ -2011,10 +2206,6 @@ static bool call_OpenPrinterEx(struct torture_context *tctx,
                               struct spoolss_DeviceMode *devmode,
                               struct policy_handle *handle);
 
-static bool test_ClosePrinter(struct torture_context *tctx,
-                             struct dcerpc_binding_handle *b,
-                             struct policy_handle *handle);
-
 static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
                                      struct dcerpc_pipe *p,
                                      struct policy_handle *handle,
@@ -2160,7 +2351,8 @@ static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
 static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
                                     struct dcerpc_pipe *p,
                                     struct policy_handle *handle,
-                                    const char *name)
+                                    const char *name,
+                                    struct spoolss_DeviceMode *addprinter_devmode)
 {
        union spoolss_PrinterInfo info;
        struct spoolss_DeviceMode *devmode;
@@ -2176,6 +2368,12 @@ static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
 
        devmode = info.info8.devmode;
 
+       if (addprinter_devmode) {
+               if (!test_devicemode_equal(tctx, devmode, addprinter_devmode)) {
+                       torture_warning(tctx, "current global DM is != DM provided in addprinter");
+               }
+       }
+
        /* run tests */
 
        ret = test_PrinterInfo_DevModes(tctx, p, handle, name);
@@ -2192,9 +2390,9 @@ static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
        return ret;
 }
 
-static bool test_ClosePrinter(struct torture_context *tctx,
-                             struct dcerpc_binding_handle *b,
-                             struct policy_handle *handle)
+bool test_ClosePrinter(struct torture_context *tctx,
+                      struct dcerpc_binding_handle *b,
+                      struct policy_handle *handle)
 {
        NTSTATUS status;
        struct spoolss_ClosePrinter r;
@@ -2235,8 +2433,7 @@ static bool test_GetForm_args(struct torture_context *tctx,
        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, needed);
-               data_blob_clear(&blob);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
                status = dcerpc_spoolss_GetForm_r(b, tctx, &r);
@@ -2249,7 +2446,7 @@ static bool test_GetForm_args(struct torture_context *tctx,
 
        torture_assert_werr_ok(tctx, r.out.result, "GetForm failed");
 
-       CHECK_NEEDED_SIZE_LEVEL(spoolss_FormInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_FormInfo, r.out.info, r.in.level, needed, 4);
 
        if (info_p) {
                *info_p = *r.out.info;
@@ -2303,8 +2500,7 @@ static bool test_EnumForms(struct torture_context *tctx,
        }
 
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -2317,7 +2513,7 @@ static bool test_EnumForms(struct torture_context *tctx,
 
        torture_assert_werr_ok(tctx, r.out.result, "EnumForms failed");
 
-       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumForms, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumForms, info, r.in.level, count, needed, 4);
 
        if (info_p) {
                *info_p = info;
@@ -2386,7 +2582,8 @@ static bool test_EnumForms_find_one(struct torture_context *tctx,
 static bool test_DeleteForm(struct torture_context *tctx,
                            struct dcerpc_binding_handle *b,
                            struct policy_handle *handle,
-                           const char *form_name)
+                           const char *form_name,
+                           WERROR expected_result)
 {
        struct spoolss_DeleteForm r;
 
@@ -2398,13 +2595,15 @@ static bool test_DeleteForm(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx,
                dcerpc_spoolss_DeleteForm_r(b, tctx, &r),
                "DeleteForm failed");
-       torture_assert_werr_ok(tctx, r.out.result,
-               "DeleteForm failed");
-       torture_assert_ntstatus_ok(tctx,
-               dcerpc_spoolss_DeleteForm_r(b, tctx, &r),
-               "2nd DeleteForm failed");
-       torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_FORM_NAME,
-               "2nd DeleteForm failed");
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "DeleteForm gave unexpected result");
+       if (W_ERROR_IS_OK(r.out.result)) {
+               torture_assert_ntstatus_ok(tctx,
+                       dcerpc_spoolss_DeleteForm_r(b, tctx, &r),
+                       "2nd DeleteForm failed");
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_FORM_NAME,
+                       "2nd DeleteForm failed");
+       }
 
        return true;
 }
@@ -2413,7 +2612,8 @@ static bool test_AddForm(struct torture_context *tctx,
                         struct dcerpc_binding_handle *b,
                         struct policy_handle *handle,
                         uint32_t level,
-                        union spoolss_AddFormInfo *info)
+                        union spoolss_AddFormInfo *info,
+                        WERROR expected_result)
 {
        struct spoolss_AddForm r;
 
@@ -2425,24 +2625,24 @@ static bool test_AddForm(struct torture_context *tctx,
        r.in.level      = level;
        r.in.info       = *info;
 
-       torture_comment(tctx, "Testing AddForm(%s) level %d\n",
-               r.in.info.info1->form_name, r.in.level);
+       torture_comment(tctx, "Testing AddForm(%s) level %d, type %d\n",
+               r.in.info.info1->form_name, r.in.level,
+               r.in.info.info1->flags);
 
        torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_AddForm_r(b, tctx, &r),
                "AddForm failed");
-       if (W_ERROR_EQUAL(r.out.result, WERR_FILE_EXISTS)) {
-               test_DeleteForm(tctx, b, handle, r.in.info.info1->form_name);
-               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_AddForm_r(b, tctx, &r),
-                       "AddForm failed");
-       }
-
-       torture_assert_werr_ok(tctx, r.out.result,
-               "AddForm failed");
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "AddForm gave unexpected result");
 
        torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_AddForm_r(b, tctx, &r),
                "2nd AddForm failed");
-       torture_assert_werr_equal(tctx, r.out.result, WERR_FILE_EXISTS,
-               "2nd AddForm gave unexpected result");
+       if (W_ERROR_EQUAL(expected_result, WERR_INVALID_PARAM)) {
+               torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM,
+                       "2nd AddForm gave unexpected result");
+       } else {
+               torture_assert_werr_equal(tctx, r.out.result, WERR_FILE_EXISTS,
+                       "2nd AddForm gave unexpected result");
+       }
 
        return true;
 }
@@ -2483,60 +2683,62 @@ static bool test_GetForm_winreg(struct torture_context *tctx,
                                uint32_t *w_length,
                                uint8_t **w_data);
 
-static bool test_Forms(struct torture_context *tctx,
-                      struct dcerpc_binding_handle *b,
-                      struct policy_handle *handle,
-                      bool print_server,
-                      const char *printer_name,
-                      struct dcerpc_binding_handle *winreg_handle,
-                      struct policy_handle *hive_handle)
+static bool test_Forms_args(struct torture_context *tctx,
+                           struct dcerpc_binding_handle *b,
+                           struct policy_handle *handle,
+                           bool print_server,
+                           const char *printer_name,
+                           struct dcerpc_binding_handle *winreg_handle,
+                           struct policy_handle *hive_handle,
+                           const char *form_name,
+                           struct spoolss_AddFormInfo1 *info1,
+                           WERROR expected_add_result,
+                           WERROR expected_delete_result)
 {
        union spoolss_FormInfo info;
-       const char *form_name = "testform3";
-
        union spoolss_AddFormInfo add_info;
-       struct spoolss_AddFormInfo1 info1;
 
        enum winreg_Type w_type;
        uint32_t w_size;
        uint32_t w_length;
        uint8_t *w_data;
 
-       info1.flags             = SPOOLSS_FORM_USER;
-       info1.form_name         = form_name;
-       info1.size.width        = 50;
-       info1.size.height       = 25;
-       info1.area.left         = 5;
-       info1.area.top          = 10;
-       info1.area.right        = 45;
-       info1.area.bottom       = 15;
-
-       add_info.info1 = &info1;
+       add_info.info1 = info1;
 
        torture_assert(tctx,
-               test_AddForm(tctx, b, handle, 1, &add_info),
+               test_AddForm(tctx, b, handle, 1, &add_info, expected_add_result),
                "failed to add form");
 
-       if (winreg_handle && hive_handle) {
+       if (winreg_handle && hive_handle && W_ERROR_IS_OK(expected_add_result)) {
+
+               struct spoolss_FormInfo1 i1;
 
                torture_assert(tctx,
                        test_GetForm_winreg(tctx, winreg_handle, hive_handle, TOP_LEVEL_CONTROL_FORMS_KEY, form_name, &w_type, &w_size, &w_length, &w_data),
                        "failed to get form via winreg");
 
+               i1.size.width   = IVAL(w_data, 0);
+               i1.size.height  = IVAL(w_data, 4);
+               i1.area.left    = IVAL(w_data, 8);
+               i1.area.top     = IVAL(w_data, 12);
+               i1.area.right   = IVAL(w_data, 16);
+               i1.area.bottom  = IVAL(w_data, 20);
+               /* skip index here */
+               i1.flags        = IVAL(w_data, 28);
+
                torture_assert_int_equal(tctx, w_type, REG_BINARY, "unexpected type");
                torture_assert_int_equal(tctx, w_size, 0x20, "unexpected size");
                torture_assert_int_equal(tctx, w_length, 0x20, "unexpected length");
-               torture_assert_mem_equal(tctx, &w_data[0], &add_info.info1->size.width, 4, "width mismatch");
-               torture_assert_mem_equal(tctx, &w_data[4], &add_info.info1->size.height, 4, "height mismatch");
-               torture_assert_mem_equal(tctx, &w_data[8], &add_info.info1->area.left, 4, "left mismatch");
-               torture_assert_mem_equal(tctx, &w_data[12], &add_info.info1->area.top, 4, "top mismatch");
-               torture_assert_mem_equal(tctx, &w_data[16], &add_info.info1->area.right, 4, "right mismatch");
-               torture_assert_mem_equal(tctx, &w_data[20], &add_info.info1->area.bottom, 4, "bottom mismatch");
-               /* skip index here */
-               torture_assert_mem_equal(tctx, &w_data[28], &add_info.info1->flags, 4, "flags mismatch");
+               torture_assert_int_equal(tctx, i1.size.width, add_info.info1->size.width, "width mismatch");
+               torture_assert_int_equal(tctx, i1.size.height, add_info.info1->size.height, "height mismatch");
+               torture_assert_int_equal(tctx, i1.area.left, add_info.info1->area.left, "left mismatch");
+               torture_assert_int_equal(tctx, i1.area.top, add_info.info1->area.top, "top mismatch");
+               torture_assert_int_equal(tctx, i1.area.right, add_info.info1->area.right, "right mismatch");
+               torture_assert_int_equal(tctx, i1.area.bottom, add_info.info1->area.bottom, "bottom mismatch");
+               torture_assert_int_equal(tctx, i1.flags, add_info.info1->flags, "flags mismatch");
        }
 
-       if (!print_server) {
+       if (!print_server && W_ERROR_IS_OK(expected_add_result)) {
                torture_assert(tctx,
                        test_GetForm_args(tctx, b, handle, form_name, 1, &info),
                        "failed to get added form");
@@ -2550,14 +2752,25 @@ static bool test_Forms(struct torture_context *tctx,
                torture_assert_int_equal(tctx, info.info1.flags, add_info.info1->flags, "flags mismatch");
 
                if (winreg_handle && hive_handle) {
-                       torture_assert_mem_equal(tctx, &w_data[0], &info.info1.size.width, 4, "width mismatch");
-                       torture_assert_mem_equal(tctx, &w_data[4], &info.info1.size.height, 4, "height mismatch");
-                       torture_assert_mem_equal(tctx, &w_data[8], &info.info1.area.left, 4, "left mismatch");
-                       torture_assert_mem_equal(tctx, &w_data[12], &info.info1.area.top, 4, "top mismatch");
-                       torture_assert_mem_equal(tctx, &w_data[16], &info.info1.area.right, 4, "right mismatch");
-                       torture_assert_mem_equal(tctx, &w_data[20], &info.info1.area.bottom, 4, "bottom mismatch");
+
+                       struct spoolss_FormInfo1 i1;
+
+                       i1.size.width   = IVAL(w_data, 0);
+                       i1.size.height  = IVAL(w_data, 4);
+                       i1.area.left    = IVAL(w_data, 8);
+                       i1.area.top     = IVAL(w_data, 12);
+                       i1.area.right   = IVAL(w_data, 16);
+                       i1.area.bottom  = IVAL(w_data, 20);
                        /* skip index here */
-                       torture_assert_mem_equal(tctx, &w_data[28], &info.info1.flags, 4, "flags mismatch");
+                       i1.flags        = IVAL(w_data, 28);
+
+                       torture_assert_int_equal(tctx, i1.size.width, info.info1.size.width, "width mismatch");
+                       torture_assert_int_equal(tctx, i1.size.height, info.info1.size.height, "height mismatch");
+                       torture_assert_int_equal(tctx, i1.area.left, info.info1.area.left, "left mismatch");
+                       torture_assert_int_equal(tctx, i1.area.top, info.info1.area.top, "top mismatch");
+                       torture_assert_int_equal(tctx, i1.area.right, info.info1.area.right, "right mismatch");
+                       torture_assert_int_equal(tctx, i1.area.bottom, info.info1.area.bottom, "bottom mismatch");
+                       torture_assert_int_equal(tctx, i1.flags, info.info1.flags, "flags mismatch");
                }
 
                add_info.info1->size.width = 1234;
@@ -2572,25 +2785,148 @@ static bool test_Forms(struct torture_context *tctx,
                torture_assert_int_equal(tctx, info.info1.size.width, add_info.info1->size.width, "width mismatch");
        }
 
-       torture_assert(tctx,
-               test_EnumForms_find_one(tctx, b, handle, print_server, form_name),
-               "Newly added form not found in enum call");
+       if (!W_ERROR_EQUAL(expected_add_result, WERR_INVALID_PARAM)) {
+               torture_assert(tctx,
+                       test_EnumForms_find_one(tctx, b, handle, print_server, form_name),
+                       "Newly added form not found in enum call");
+       }
 
        torture_assert(tctx,
-               test_DeleteForm(tctx, b, handle, form_name),
+               test_DeleteForm(tctx, b, handle, form_name, expected_delete_result),
                "failed to delete form");
 
        return true;
 }
 
+static bool test_Forms(struct torture_context *tctx,
+                      struct dcerpc_binding_handle *b,
+                      struct policy_handle *handle,
+                      bool print_server,
+                      const char *printer_name,
+                      struct dcerpc_binding_handle *winreg_handle,
+                      struct policy_handle *hive_handle)
+{
+       const struct spoolss_FormSize size = {
+               .width  = 50,
+               .height = 25
+       };
+       const struct spoolss_FormArea area = {
+               .left   = 5,
+               .top    = 10,
+               .right  = 45,
+               .bottom = 15
+       };
+       int i;
+
+       struct {
+               struct spoolss_AddFormInfo1 info1;
+               WERROR expected_add_result;
+               WERROR expected_delete_result;
+       } forms[] = {
+               {
+                       .info1 = {
+                               .flags          = SPOOLSS_FORM_USER,
+                               .form_name      = "testform_user",
+                               .size           = size,
+                               .area           = area,
+                       },
+                       .expected_add_result    = WERR_OK,
+                       .expected_delete_result = WERR_OK
+               },
+/*
+               weird, we can add a builtin form but we can never remove it
+               again - gd
+
+               {
+                       .info1 = {
+                               .flags          = SPOOLSS_FORM_BUILTIN,
+                               .form_name      = "testform_builtin",
+                               .size           = size,
+                               .area           = area,
+                       },
+                       .expected_add_result    = WERR_OK,
+                       .expected_delete_result = WERR_INVALID_PARAM,
+               },
+*/
+               {
+                       .info1 = {
+                               .flags          = SPOOLSS_FORM_PRINTER,
+                               .form_name      = "testform_printer",
+                               .size           = size,
+                               .area           = area,
+                       },
+                       .expected_add_result    = WERR_OK,
+                       .expected_delete_result = WERR_OK
+               },
+               {
+                       .info1 = {
+                               .flags          = SPOOLSS_FORM_USER,
+                               .form_name      = "Letter",
+                               .size           = size,
+                               .area           = area,
+                       },
+                       .expected_add_result    = WERR_FILE_EXISTS,
+                       .expected_delete_result = WERR_INVALID_PARAM
+               },
+               {
+                       .info1 = {
+                               .flags          = SPOOLSS_FORM_BUILTIN,
+                               .form_name      = "Letter",
+                               .size           = size,
+                               .area           = area,
+                       },
+                       .expected_add_result    = WERR_FILE_EXISTS,
+                       .expected_delete_result = WERR_INVALID_PARAM
+               },
+               {
+                       .info1 = {
+                               .flags          = SPOOLSS_FORM_PRINTER,
+                               .form_name      = "Letter",
+                               .size           = size,
+                               .area           = area,
+                       },
+                       .expected_add_result    = WERR_FILE_EXISTS,
+                       .expected_delete_result = WERR_INVALID_PARAM
+               },
+               {
+                       .info1 = {
+                               .flags          = 12345,
+                               .form_name      = "invalid_flags",
+                               .size           = size,
+                               .area           = area,
+                       },
+                       .expected_add_result    = WERR_INVALID_PARAM,
+                       .expected_delete_result = WERR_INVALID_FORM_NAME
+               }
+
+       };
+
+       for (i=0; i < ARRAY_SIZE(forms); i++) {
+               torture_assert(tctx,
+                       test_Forms_args(tctx, b, handle, print_server, printer_name,
+                                       winreg_handle, hive_handle,
+                                       forms[i].info1.form_name,
+                                       &forms[i].info1,
+                                       forms[i].expected_add_result,
+                                       forms[i].expected_delete_result),
+                       talloc_asprintf(tctx, "failed to test form '%s'", forms[i].info1.form_name));
+       }
+
+       return true;
+}
+
 static bool test_EnumPorts_old(struct torture_context *tctx,
-                              struct dcerpc_pipe *p)
+                              void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+
        NTSTATUS status;
        struct spoolss_EnumPorts r;
        uint32_t needed;
        uint32_t count;
        union spoolss_PortInfo *info;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.servername = talloc_asprintf(tctx, "\\\\%s",
@@ -2609,8 +2945,7 @@ 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, needed);
-               data_blob_clear(&blob);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -2623,16 +2958,20 @@ static bool test_EnumPorts_old(struct torture_context *tctx,
 
        torture_assert_werr_ok(tctx, r.out.result, "EnumPorts failed");
 
-       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPorts, info, 2, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPorts, info, 2, count, needed, 4);
 
        return true;
 }
 
 static bool test_AddPort(struct torture_context *tctx,
-                        struct dcerpc_pipe *p)
+                        void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+
        NTSTATUS status;
        struct spoolss_AddPort r;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.server_name = talloc_asprintf(tctx, "\\\\%s",
@@ -2689,19 +3028,19 @@ static bool test_GetJob_args(struct torture_context *tctx,
        }
 
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
                status = dcerpc_spoolss_GetJob_r(b, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
-               torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
-               torture_assert(tctx, r.out.info, "No job info returned");
-
-               CHECK_NEEDED_SIZE_LEVEL(spoolss_JobInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
        }
 
+       torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
+       torture_assert(tctx, r.out.info, "No job info returned");
+
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_JobInfo, r.out.info, r.in.level, needed, 4);
+
        if (info_p) {
                *info_p = *r.out.info;
        }
@@ -2728,7 +3067,9 @@ static bool test_GetJob(struct torture_context *tctx,
 
 static bool test_SetJob(struct torture_context *tctx,
                        struct dcerpc_binding_handle *b,
-                       struct policy_handle *handle, uint32_t job_id,
+                       struct policy_handle *handle,
+                       uint32_t job_id,
+                       struct spoolss_JobInfoContainer *ctr,
                        enum spoolss_JobControl command)
 {
        NTSTATUS status;
@@ -2736,12 +3077,12 @@ static bool test_SetJob(struct torture_context *tctx,
 
        r.in.handle     = handle;
        r.in.job_id     = job_id;
-       r.in.ctr        = NULL;
+       r.in.ctr        = ctr;
        r.in.command    = command;
 
        switch (command) {
        case SPOOLSS_JOB_CONTROL_PAUSE:
-               torture_comment(tctx, "Testing SetJob(%d) SPOOLSS_JOB_CONTROL_PAUSE\n", job_id);
+               torture_comment(tctx, "Testing SetJob(%d), SPOOLSS_JOB_CONTROL_PAUSE\n", job_id);
                break;
        case SPOOLSS_JOB_CONTROL_RESUME:
                torture_comment(tctx, "Testing SetJob(%d), SPOOLSS_JOB_CONTROL_RESUME\n", job_id);
@@ -2837,8 +3178,7 @@ static bool test_EnumJobs_args(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx, status, "EnumJobs failed");
 
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
 
@@ -2848,7 +3188,7 @@ static bool test_EnumJobs_args(struct torture_context *tctx,
                torture_assert_werr_ok(tctx, r.out.result, "EnumJobs failed");
                torture_assert(tctx, info, "No jobs returned");
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumJobs, *r.out.info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumJobs, *r.out.info, r.in.level, count, needed, 4);
 
        } else {
                torture_assert_werr_ok(tctx, r.out.result, "EnumJobs failed");
@@ -2955,6 +3295,10 @@ static bool test_DoPrintTest_check_jobs(struct torture_context *tctx,
 
        for (i=0; i < num_jobs; i++) {
                union spoolss_JobInfo ginfo;
+               const char *document_name;
+               const char *new_document_name = "any_other_docname";
+               struct spoolss_JobInfoContainer ctr;
+               struct spoolss_SetJobInfo1 info1;
 
                torture_assert_int_equal(tctx, info[i].info1.job_id, job_ids[i], "job id mismatch");
 
@@ -2963,15 +3307,48 @@ static bool test_DoPrintTest_check_jobs(struct torture_context *tctx,
                        "failed to call test_GetJob");
 
                torture_assert_int_equal(tctx, ginfo.info1.job_id, info[i].info1.job_id, "job id mismatch");
-       }
 
-       for (i=0; i < num_jobs; i++) {
+               document_name = ginfo.info1.document_name;
+
+               info1.job_id            = ginfo.info1.job_id;
+               info1.printer_name      = ginfo.info1.printer_name;
+               info1.server_name       = ginfo.info1.server_name;
+               info1.user_name         = ginfo.info1.user_name;
+               info1.document_name     = new_document_name;
+               info1.data_type         = ginfo.info1.data_type;
+               info1.text_status       = ginfo.info1.text_status;
+               info1.status            = ginfo.info1.status;
+               info1.priority          = ginfo.info1.priority;
+               info1.position          = ginfo.info1.position;
+               info1.total_pages       = ginfo.info1.total_pages;
+               info1.pages_printed     = ginfo.info1.pages_printed;
+               info1.submitted         = ginfo.info1.submitted;
+
+               ctr.level = 1;
+               ctr.info.info1 = &info1;
+
                torture_assert(tctx,
-                       test_SetJob(tctx, b, handle, info[i].info1.job_id, SPOOLSS_JOB_CONTROL_PAUSE),
-                       "failed to pause printjob");
+                       test_SetJob(tctx, b, handle, info[i].info1.job_id, &ctr, 0),
+                       "failed to call test_SetJob level 1");
+
                torture_assert(tctx,
-                       test_SetJob(tctx, b, handle, info[i].info1.job_id, SPOOLSS_JOB_CONTROL_RESUME),
-                       "failed to resume printjob");
+                       test_GetJob_args(tctx, b, handle, info[i].info1.job_id, 1, &ginfo),
+                       "failed to call test_GetJob");
+
+               if (strequal(ginfo.info1.document_name, document_name)) {
+                       torture_warning(tctx,
+                                       "document_name did *NOT* change from '%s' to '%s'\n",
+                                       document_name, new_document_name);
+               }
+       }
+
+       for (i=0; i < num_jobs; i++) {
+               if (!test_SetJob(tctx, b, handle, info[i].info1.job_id, NULL, SPOOLSS_JOB_CONTROL_PAUSE)) {
+                       torture_warning(tctx, "failed to pause printjob\n");
+               }
+               if (!test_SetJob(tctx, b, handle, info[i].info1.job_id, NULL, SPOOLSS_JOB_CONTROL_RESUME)) {
+                       torture_warning(tctx, "failed to resume printjob\n");
+               }
        }
 
        return true;
@@ -2986,6 +3363,35 @@ static bool test_DoPrintTest(struct torture_context *tctx,
        uint32_t *job_ids;
        int i;
 
+       torture_comment(tctx, "Testing real print operations\n");
+
+       job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
+
+       for (i=0; i < num_jobs; i++) {
+               ret &= test_DoPrintTest_add_one_job(tctx, b, handle, &job_ids[i]);
+       }
+
+       for (i=0; i < num_jobs; i++) {
+               ret &= test_SetJob(tctx, b, handle, job_ids[i], NULL, SPOOLSS_JOB_CONTROL_DELETE);
+       }
+
+       if (ret == true) {
+               torture_comment(tctx, "real print operations test succeeded\n\n");
+       }
+
+       return ret;
+}
+
+static bool test_DoPrintTest_extended(struct torture_context *tctx,
+                                     struct dcerpc_binding_handle *b,
+                                     struct policy_handle *handle)
+{
+       bool ret = true;
+       uint32_t num_jobs = 8;
+       uint32_t *job_ids;
+       int i;
+       torture_comment(tctx, "Testing real print operations (extended)\n");
+
        job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
 
        for (i=0; i < num_jobs; i++) {
@@ -2995,7 +3401,11 @@ static bool test_DoPrintTest(struct torture_context *tctx,
        ret &= test_DoPrintTest_check_jobs(tctx, b, handle, num_jobs, job_ids);
 
        for (i=0; i < num_jobs; i++) {
-               ret &= test_SetJob(tctx, b, handle, job_ids[i], SPOOLSS_JOB_CONTROL_DELETE);
+               ret &= test_SetJob(tctx, b, handle, job_ids[i], NULL, SPOOLSS_JOB_CONTROL_DELETE);
+       }
+
+       if (ret == true) {
+               torture_comment(tctx, "real print operations (extended) test succeeded\n\n");
        }
 
        return ret;
@@ -3067,13 +3477,14 @@ static bool test_ResumePrinter(struct torture_context *tctx,
        return true;
 }
 
-static bool test_GetPrinterData(struct torture_context *tctx,
-                               struct dcerpc_binding_handle *b,
-                               struct policy_handle *handle,
-                               const char *value_name,
-                               enum winreg_Type *type_p,
-                               uint8_t **data_p,
-                               uint32_t *needed_p)
+static bool test_GetPrinterData_checktype(struct torture_context *tctx,
+                                         struct dcerpc_binding_handle *b,
+                                         struct policy_handle *handle,
+                                         const char *value_name,
+                                         enum winreg_Type *expected_type,
+                                         enum winreg_Type *type_p,
+                                         uint8_t **data_p,
+                                         uint32_t *needed_p)
 {
        NTSTATUS status;
        struct spoolss_GetPrinterData r;
@@ -3094,6 +3505,9 @@ static bool test_GetPrinterData(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx, status, "GetPrinterData failed");
 
        if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
+               if (expected_type) {
+                       torture_assert_int_equal(tctx, type, *expected_type, "unexpected type");
+               }
                r.in.offered = needed;
                r.out.data = talloc_zero_array(tctx, uint8_t, r.in.offered);
                status = dcerpc_spoolss_GetPrinterData_r(b, tctx, &r);
@@ -3103,7 +3517,7 @@ static bool test_GetPrinterData(struct torture_context *tctx,
        torture_assert_werr_ok(tctx, r.out.result,
                talloc_asprintf(tctx, "GetPrinterData(%s) failed", r.in.value_name));
 
-       CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterData, &data, type, lp_iconv_convenience(tctx->lp_ctx), needed, 1);
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterData, &data, type, needed, 1);
 
        if (type_p) {
                *type_p = type;
@@ -3120,14 +3534,27 @@ static bool test_GetPrinterData(struct torture_context *tctx,
        return true;
 }
 
-static bool test_GetPrinterDataEx(struct torture_context *tctx,
-                                 struct dcerpc_pipe *p,
-                                 struct policy_handle *handle,
-                                 const char *key_name,
-                                 const char *value_name,
-                                 enum winreg_Type *type_p,
-                                 uint8_t **data_p,
-                                 uint32_t *needed_p)
+static bool test_GetPrinterData(struct torture_context *tctx,
+                               struct dcerpc_binding_handle *b,
+                               struct policy_handle *handle,
+                               const char *value_name,
+                               enum winreg_Type *type_p,
+                               uint8_t **data_p,
+                               uint32_t *needed_p)
+{
+       return test_GetPrinterData_checktype(tctx, b, handle, value_name,
+                                            NULL, type_p, data_p, needed_p);
+}
+
+static bool test_GetPrinterDataEx_checktype(struct torture_context *tctx,
+                                           struct dcerpc_pipe *p,
+                                           struct policy_handle *handle,
+                                           const char *key_name,
+                                           const char *value_name,
+                                           enum winreg_Type *expected_type,
+                                           enum winreg_Type *type_p,
+                                           uint8_t **data_p,
+                                           uint32_t *needed_p)
 {
        NTSTATUS status;
        struct spoolss_GetPrinterDataEx r;
@@ -3149,14 +3576,16 @@ static bool test_GetPrinterDataEx(struct torture_context *tctx,
 
        status = dcerpc_spoolss_GetPrinterDataEx_r(b, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               if (NT_STATUS_EQUAL(status,NT_STATUS_NET_WRITE_FAULT) &&
-                   p->last_fault_code == DCERPC_FAULT_OP_RNG_ERROR) {
+               if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
                        torture_skip(tctx, "GetPrinterDataEx not supported by server\n");
                }
                torture_assert_ntstatus_ok(tctx, status, "GetPrinterDataEx failed");
        }
 
        if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
+               if (expected_type) {
+                       torture_assert_int_equal(tctx, type, *expected_type, "unexpected type");
+               }
                r.in.offered = needed;
                r.out.data = talloc_zero_array(tctx, uint8_t, r.in.offered);
                status = dcerpc_spoolss_GetPrinterDataEx_r(b, tctx, &r);
@@ -3166,7 +3595,7 @@ static bool test_GetPrinterDataEx(struct torture_context *tctx,
        torture_assert_werr_ok(tctx, r.out.result,
                talloc_asprintf(tctx, "GetPrinterDataEx(%s - %s) failed", r.in.key_name, r.in.value_name));
 
-       CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterData, &data, type, lp_iconv_convenience(tctx->lp_ctx), needed, 1);
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterData, &data, type, needed, 1);
 
        if (type_p) {
                *type_p = type;
@@ -3183,11 +3612,47 @@ static bool test_GetPrinterDataEx(struct torture_context *tctx,
        return true;
 }
 
+static bool test_GetPrinterDataEx(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p,
+                                 struct policy_handle *handle,
+                                 const char *key_name,
+                                 const char *value_name,
+                                 enum winreg_Type *type_p,
+                                 uint8_t **data_p,
+                                 uint32_t *needed_p)
+{
+       return test_GetPrinterDataEx_checktype(tctx, p, handle, key_name, value_name,
+                                              NULL, type_p, data_p, needed_p);
+}
+
+static bool test_get_environment(struct torture_context *tctx,
+                                struct dcerpc_binding_handle *b,
+                                struct policy_handle *handle,
+                                const char **architecture)
+{
+       DATA_BLOB blob;
+       enum winreg_Type type;
+       uint8_t *data;
+       uint32_t needed;
+
+       torture_assert(tctx,
+               test_GetPrinterData(tctx, b, handle, "Architecture", &type, &data, &needed),
+               "failed to get Architecture");
+
+       torture_assert_int_equal(tctx, type, REG_SZ, "unexpected type");
+
+       blob = data_blob_const(data, needed);
+       *architecture = reg_val_data_string(tctx, REG_SZ, blob);
+
+       return true;
+}
+
 static bool test_GetPrinterData_list(struct torture_context *tctx,
-                                    struct dcerpc_pipe *p,
-                                    struct policy_handle *handle,
-                                    const char **architecture)
+                                    void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
        struct dcerpc_binding_handle *b = p->binding_handle;
        const char *list[] = {
                "W3SvcInstalled",
@@ -3211,20 +3676,13 @@ static bool test_GetPrinterData_list(struct torture_context *tctx,
                uint8_t *data, *data_ex;
                uint32_t needed, needed_ex;
 
-               torture_assert(tctx, test_GetPrinterData(tctx, b, handle, list[i], &type, &data, &needed),
+               torture_assert(tctx, test_GetPrinterData(tctx, b, &ctx->server_handle, list[i], &type, &data, &needed),
                        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, &needed_ex),
+               torture_assert(tctx, test_GetPrinterDataEx(tctx, p, &ctx->server_handle, "random_string", list[i], &type_ex, &data_ex, &needed_ex),
                        talloc_asprintf(tctx, "GetPrinterDataEx failed on %s\n", list[i]));
                torture_assert_int_equal(tctx, type, type_ex, "type mismatch");
                torture_assert_int_equal(tctx, needed, needed_ex, "needed mismatch");
                torture_assert_mem_equal(tctx, data, data_ex, needed, "data mismatch");
-
-               if (strequal(list[i], "Architecture")) {
-                       if (architecture) {
-                               DATA_BLOB blob = data_blob_const(data, needed);
-                               *architecture = reg_val_data_string(tctx, lp_iconv_convenience(tctx->lp_ctx), REG_SZ, blob);
-                       }
-               }
        }
 
        return true;
@@ -3363,7 +3821,7 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx,
 
        torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDataEx failed");
 
-       CHECK_NEEDED_SIZE_ENUM(spoolss_EnumPrinterDataEx, info, count, lp_iconv_convenience(tctx->lp_ctx), needed, 1);
+       CHECK_NEEDED_SIZE_ENUM(spoolss_EnumPrinterDataEx, info, count, needed, 1);
 
        if (count_p) {
                *count_p = count;
@@ -3404,9 +3862,8 @@ static bool test_EnumPrinterData_consistency(struct torture_context *tctx,
 
        torture_comment(tctx, "Testing EnumPrinterData vs EnumPrinterDataEx consistency\n");
 
-       torture_assert(tctx,
-               reg_string_to_val(tctx, lp_iconv_convenience(tctx->lp_ctx),
-                                 "REG_SZ", "torture_data1", &type, &blob), "");
+       torture_assert(tctx, push_reg_sz(tctx, &blob, "torture_data1"), "");
+       type = REG_SZ;
 
        torture_assert(tctx,
                test_SetPrinterData(tctx, b, handle, "torture_value1", type, blob.data, blob.length),
@@ -3605,17 +4062,18 @@ static void init_winreg_String(struct winreg_String *name, const char *s)
        }
 }
 
-static bool test_winreg_OpenKey(struct torture_context *tctx,
-                               struct dcerpc_binding_handle *b,
-                               struct policy_handle *hive_handle,
-                               const char *keyname,
-                               struct policy_handle *key_handle)
+static bool test_winreg_OpenKey_opts(struct torture_context *tctx,
+                                    struct dcerpc_binding_handle *b,
+                                    struct policy_handle *hive_handle,
+                                    const char *keyname,
+                                    uint32_t options,
+                                    struct policy_handle *key_handle)
 {
        struct winreg_OpenKey r;
 
        r.in.parent_handle = hive_handle;
        init_winreg_String(&r.in.keyname, keyname);
-       r.in.options = REG_KEYTYPE_NON_VOLATILE;
+       r.in.options = options;
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = key_handle;
 
@@ -3627,6 +4085,16 @@ static bool test_winreg_OpenKey(struct torture_context *tctx,
        return true;
 }
 
+static bool test_winreg_OpenKey(struct torture_context *tctx,
+                               struct dcerpc_binding_handle *b,
+                               struct policy_handle *hive_handle,
+                               const char *keyname,
+                               struct policy_handle *key_handle)
+{
+       return test_winreg_OpenKey_opts(tctx, b, hive_handle, keyname,
+                                       REG_OPTION_NON_VOLATILE, key_handle);
+}
+
 static bool test_winreg_CloseKey(struct torture_context *tctx,
                                 struct dcerpc_binding_handle *b,
                                 struct policy_handle *handle)
@@ -3756,75 +4224,583 @@ static bool test_GetForm_winreg(struct torture_context *tctx,
        return true;
 }
 
-static bool test_SetPrinterData(struct torture_context *tctx,
-                               struct dcerpc_binding_handle *b,
-                               struct policy_handle *handle,
-                               const char *value_name,
-                               enum winreg_Type type,
-                               uint8_t *data,
-                               uint32_t offered)
+static bool test_winreg_symbolic_link(struct torture_context *tctx,
+                                     struct dcerpc_binding_handle *b,
+                                     struct policy_handle *handle,
+                                     const char *symlink_keyname,
+                                     const char *symlink_destination)
 {
-       struct spoolss_SetPrinterData r;
+       /* check if the first key is a symlink to the second key */
 
-       r.in.handle = handle;
-       r.in.value_name = value_name;
-       r.in.type = type;
-       r.in.data = data;
-       r.in.offered = offered;
+       enum winreg_Type w_type;
+       uint32_t w_size;
+       uint32_t w_length;
+       uint8_t *w_data;
+       struct policy_handle key_handle;
+       DATA_BLOB blob;
+       const char *str;
 
-       torture_comment(tctx, "Testing SetPrinterData(%s)\n",
-               r.in.value_name);
+       if (torture_setting_bool(tctx, "samba3", false)) {
+               torture_skip(tctx, "skip winreg symlink test against samba");
+       }
 
-       torture_assert_ntstatus_ok(tctx,
-               dcerpc_spoolss_SetPrinterData_r(b, tctx, &r),
-               "SetPrinterData failed");
-       torture_assert_werr_ok(tctx, r.out.result,
-               "SetPrinterData failed");
+       torture_assert(tctx,
+               test_winreg_OpenKey_opts(tctx, b, handle, symlink_keyname, REG_OPTION_OPEN_LINK, &key_handle),
+                       "failed to open key link");
+
+       torture_assert(tctx,
+               test_winreg_QueryValue(tctx, b, &key_handle,
+                                      "SymbolicLinkValue",
+                                      &w_type, &w_size, &w_length, &w_data),
+               "failed to query for 'SymbolicLinkValue' attribute");
+
+       torture_assert_int_equal(tctx, w_type, REG_LINK, "unexpected type");
+
+       blob = data_blob(w_data, w_size);
+       str = reg_val_data_string(tctx, REG_SZ, blob);
+
+       torture_assert_str_equal(tctx, str, symlink_destination, "unexpected symlink target string");
+
+       torture_assert(tctx,
+               test_winreg_CloseKey(tctx, b, &key_handle),
+               "failed to close key link");
 
        return true;
 }
 
-static bool test_SetPrinterData_matrix(struct torture_context *tctx,
+static const char *strip_unc(const char *unc)
+{
+       char *name;
+
+       if (!unc) {
+               return NULL;
+       }
+
+       if (unc[0] == '\\' && unc[1] == '\\') {
+               unc +=2;
+       }
+
+       name = strchr(unc, '\\');
+       if (name) {
+               return name+1;
+       }
+
+       return unc;
+}
+
+static bool test_GetPrinterInfo_winreg(struct torture_context *tctx,
                                       struct dcerpc_binding_handle *b,
                                       struct policy_handle *handle,
                                       const char *printer_name,
                                       struct dcerpc_binding_handle *winreg_handle,
                                       struct policy_handle *hive_handle)
 {
-       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"
+       union spoolss_PrinterInfo info;
+       const char *keys[] = {
+               TOP_LEVEL_CONTROL_PRINTERS_KEY,
+               TOP_LEVEL_PRINT_PRINTERS_KEY
+       };
+       int i;
+       const char *printername, *sharename;
+
+       torture_comment(tctx, "Testing Printer Info and winreg consistency\n");
+
+       torture_assert(tctx,
+               test_GetPrinter_level(tctx, b, handle, 2, &info),
+               "failed to get printer info level 2");
+
+       printername = strip_unc(info.info2.printername);
+       sharename = strip_unc(info.info2.sharename);
+
+#define test_sz(wname, iname) \
+do {\
+       DATA_BLOB blob;\
+       const char *str;\
+       enum winreg_Type w_type;\
+       uint32_t w_size;\
+       uint32_t w_length;\
+       uint8_t *w_data;\
+       torture_assert(tctx,\
+               test_winreg_QueryValue(tctx, winreg_handle, &key_handle, wname,\
+                                      &w_type, &w_size, &w_length, &w_data),\
+               "failed to query winreg");\
+       torture_assert_int_equal(tctx, w_type, REG_SZ, "unexpected type");\
+       blob = data_blob(w_data, w_size);\
+       str = reg_val_data_string(tctx, REG_SZ, blob);\
+       if (w_size == 2 && iname == NULL) {\
+               /*torture_comment(tctx, "%s: \"\", %s: (null)\n", #wname, #iname);\ */\
+       } else {\
+               torture_assert_str_equal(tctx, str, iname,\
+                       talloc_asprintf(tctx, "%s - %s mismatch", #wname, #iname));\
+       }\
+} while(0);
+
+#define test_dword(wname, iname) \
+do {\
+       uint32_t value;\
+       enum winreg_Type w_type;\
+       uint32_t w_size;\
+       uint32_t w_length;\
+       uint8_t *w_data;\
+       torture_assert(tctx,\
+               test_winreg_QueryValue(tctx, winreg_handle, &key_handle, wname,\
+                                      &w_type, &w_size, &w_length, &w_data),\
+               "failed to query winreg");\
+       torture_assert_int_equal(tctx, w_type, REG_DWORD, "unexpected type");\
+       torture_assert_int_equal(tctx, w_size, 4, "unexpected size");\
+       torture_assert_int_equal(tctx, w_length, 4, "unexpected length");\
+       value = IVAL(w_data, 0);\
+       torture_assert_int_equal(tctx, value, iname,\
+               talloc_asprintf(tctx, "%s - %s mismatch", #wname, #iname));\
+} while(0);
+
+#define test_dm(wname, iname) \
+do {\
+       DATA_BLOB blob;\
+       struct spoolss_DeviceMode dm;\
+       enum ndr_err_code ndr_err;\
+       enum winreg_Type w_type;\
+       uint32_t w_size;\
+       uint32_t w_length;\
+       uint8_t *w_data;\
+       torture_assert(tctx,\
+               test_winreg_QueryValue(tctx, winreg_handle, &key_handle, wname,\
+                                      &w_type, &w_size, &w_length, &w_data),\
+               "failed to query winreg");\
+       torture_assert_int_equal(tctx, w_type, REG_BINARY, "unexpected type");\
+       blob = data_blob(w_data, w_size);\
+       ndr_err = ndr_pull_struct_blob(&blob, tctx, &dm,\
+               (ndr_pull_flags_fn_t)ndr_pull_spoolss_DeviceMode);\
+       torture_assert_ndr_success(tctx, ndr_err, "failed to unmarshall dm");\
+       torture_assert(tctx, test_devicemode_equal(tctx, &dm, iname),\
+               "dm unequal");\
+} while(0);
+
+#define test_sd(wname, iname) \
+do {\
+       DATA_BLOB blob;\
+       struct security_descriptor sd;\
+       enum ndr_err_code ndr_err;\
+       enum winreg_Type w_type;\
+       uint32_t w_size;\
+       uint32_t w_length;\
+       uint8_t *w_data;\
+       torture_assert(tctx,\
+               test_winreg_QueryValue(tctx, winreg_handle, &key_handle, wname,\
+                                      &w_type, &w_size, &w_length, &w_data),\
+               "failed to query winreg");\
+       torture_assert_int_equal(tctx, w_type, REG_BINARY, "unexpected type");\
+       blob = data_blob(w_data, w_size);\
+       ndr_err = ndr_pull_struct_blob(&blob, tctx, &sd,\
+               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);\
+       torture_assert_ndr_success(tctx, ndr_err, "failed to unmarshall sd");\
+       torture_assert(tctx, test_security_descriptor_equal(tctx, &sd, iname),\
+               "sd unequal");\
+} while(0);
+
+#define test_multi_sz(wname, iname) \
+do {\
+       DATA_BLOB blob;\
+       const char **array;\
+       enum winreg_Type w_type;\
+       uint32_t w_size;\
+       uint32_t w_length;\
+       uint8_t *w_data;\
+       int i;\
+       torture_assert(tctx,\
+               test_winreg_QueryValue(tctx, winreg_handle, &key_handle, wname,\
+                                      &w_type, &w_size, &w_length, &w_data),\
+               "failed to query winreg");\
+       torture_assert_int_equal(tctx, w_type, REG_MULTI_SZ, "unexpected type");\
+       blob = data_blob(w_data, w_size);\
+       torture_assert(tctx, \
+               pull_reg_multi_sz(tctx, &blob, &array),\
+               "failed to pull multi sz");\
+       for (i=0; array[i] != NULL; i++) {\
+               torture_assert_str_equal(tctx, array[i], iname[i],\
+                       talloc_asprintf(tctx, "%s - %s mismatch", #wname, iname[i]));\
+       }\
+} while(0);
+
+       if (!test_winreg_symbolic_link(tctx, winreg_handle, hive_handle,
+                                      TOP_LEVEL_CONTROL_PRINTERS_KEY,
+                                      "\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers"))
+       {
+               torture_warning(tctx, "failed to check for winreg symlink");
+       }
+
+       for (i=0; i < ARRAY_SIZE(keys); i++) {
+
+               const char *printer_key;
+               struct policy_handle key_handle;
+
+               printer_key = talloc_asprintf(tctx, "%s\\%s",
+                       keys[i], printer_name);
+
+               torture_assert(tctx,
+                       test_winreg_OpenKey(tctx, winreg_handle, hive_handle, printer_key, &key_handle), "");
+
+               test_sz("Name", printername);
+               test_sz("Share Name", sharename);
+               test_sz("Port", info.info2.portname);
+               test_sz("Printer Driver", info.info2.drivername);
+               test_sz("Description", info.info2.comment);
+               test_sz("Location", info.info2.location);
+               test_sz("Separator File", info.info2.sepfile);
+               test_sz("Print Processor", info.info2.printprocessor);
+               test_sz("Datatype", info.info2.datatype);
+               test_sz("Parameters", info.info2.parameters);
+               /* winreg: 0, spoolss not */
+/*             test_dword("Attributes", info.info2.attributes); */
+               test_dword("Priority", info.info2.priority);
+               test_dword("Default Priority", info.info2.defaultpriority);
+               /* winreg: 60, spoolss: 0 */
+/*             test_dword("StartTime", info.info2.starttime); */
+/*             test_dword("UntilTime", info.info2.untiltime); */
+               /* winreg != spoolss */
+/*             test_dword("Status", info.info2.status); */
+               test_dm("Default DevMode", info.info2.devmode);
+               test_sd("Security", info.info2.secdesc);
+
+               torture_assert(tctx,
+                       test_winreg_CloseKey(tctx, winreg_handle, &key_handle), "");
+       }
+
+#undef test_dm
+#undef test_sd
+
+       torture_comment(tctx, "Printer Info and winreg consistency test succeeded\n\n");
+
+       return true;
+}
+
+static bool test_PrintProcessors(struct torture_context *tctx,
+                                struct dcerpc_binding_handle *b,
+                                const char *environment,
+                                struct dcerpc_binding_handle *winreg_handle,
+                                struct policy_handle *hive_handle)
+{
+       union spoolss_PrintProcessorInfo *info;
+       uint32_t count;
+       int i;
+
+       torture_comment(tctx, "Testing Print Processor Info and winreg consistency\n");
+
+       torture_assert(tctx,
+               test_EnumPrintProcessors_level(tctx, b, environment, 1, &count, &info, WERR_OK),
+               "failed to enum print processors level 1");
+
+       for (i=0; i < count; i++) {
+
+               const char *processor_key;
+               struct policy_handle key_handle;
+
+               processor_key = talloc_asprintf(tctx, "%s\\%s\\Print Processors\\%s",
+                                               TOP_LEVEL_CONTROL_ENVIRONMENTS_KEY,
+                                               environment,
+                                               info[i].info1.print_processor_name);
+
+               torture_assert(tctx,
+                       test_winreg_OpenKey(tctx, winreg_handle, hive_handle, processor_key, &key_handle), "");
+
+               /* nothing to check in there so far */
+
+               torture_assert(tctx,
+                       test_winreg_CloseKey(tctx, winreg_handle, &key_handle), "");
+       }
+
+       torture_comment(tctx, "Print Processor Info and winreg consistency test succeeded\n\n");
+
+       return true;
+}
+
+static bool test_GetPrinterDriver2_level(struct torture_context *tctx,
+                                        struct dcerpc_binding_handle *b,
+                                        struct policy_handle *handle,
+                                        const char *driver_name,
+                                        const char *architecture,
+                                        uint32_t level,
+                                        uint32_t client_major_version,
+                                        uint32_t client_minor_version,
+                                        union spoolss_DriverInfo *info_p,
+                                        WERROR *result);
+
+static const char *strip_path(const char *path)
+{
+       char *p;
+
+       if (path == NULL) {
+               return NULL;
+       }
+
+       p = strrchr(path, '\\');
+       if (p) {
+               return p+1;
+       }
+
+       return path;
+}
+
+static const char **strip_paths(const char **path_array)
+{
+       int i;
+
+       if (path_array == NULL) {
+               return NULL;
+       }
+
+       for (i=0; path_array[i] != NULL; i++) {
+               path_array[i] = strip_path(path_array[i]);
+       }
+
+       return path_array;
+}
+
+static const char *driver_winreg_date(TALLOC_CTX *mem_ctx, NTTIME nt)
+{
+       time_t t;
+       struct tm *tm;
+       t = nt_time_to_unix(nt);
+       tm = localtime(&t);
+
+       return talloc_asprintf(mem_ctx, "%02d/%02d/%04d",
+               tm->tm_mon + 1, tm->tm_mday, tm->tm_year + 1900);
+}
+
+static const char *driver_winreg_version(TALLOC_CTX *mem_ctx, uint64_t v)
+{
+       return talloc_asprintf(mem_ctx, "%u.%u.%u.%u",
+               (unsigned)((v >> 48) & 0xFFFF),
+               (unsigned)((v >> 32) & 0xFFFF),
+               (unsigned)((v >> 16) & 0xFFFF),
+               (unsigned)(v & 0xFFFF));
+}
+
+static bool test_GetDriverInfo_winreg(struct torture_context *tctx,
+                                     struct dcerpc_binding_handle *b,
+                                     struct policy_handle *handle,
+                                     const char *printer_name,
+                                     const char *driver_name,
+                                     const char *environment,
+                                     struct dcerpc_binding_handle *winreg_handle,
+                                     struct policy_handle *hive_handle)
+{
+       WERROR result;
+       union spoolss_DriverInfo info;
+       const char *driver_key;
+       struct policy_handle key_handle;
+
+       const char *driver_path;
+       const char *data_file;
+       const char *config_file;
+       const char *help_file;
+       const char **dependent_files;
+
+       const char *driver_date;
+       const char *inbox_driver_date;
+
+       const char *driver_version;
+       const char *inbox_driver_version;
+
+       torture_comment(tctx, "Testing Driver Info and winreg consistency\n");
+
+       driver_key = talloc_asprintf(tctx, "%s\\%s\\Drivers\\Version-%d\\%s",
+                                    TOP_LEVEL_CONTROL_ENVIRONMENTS_KEY,
+                                    environment,
+                                    3,
+                                    driver_name);
+
+       torture_assert(tctx,
+               test_winreg_OpenKey(tctx, winreg_handle, hive_handle, driver_key, &key_handle),
+               "failed to open driver key");
+
+       if (torture_setting_bool(tctx, "samba3", false)) {
+               goto try_level3;
+       }
+
+       torture_assert(tctx,
+               test_GetPrinterDriver2_level(tctx, b, handle, driver_name, environment, 8, 3, 0, &info, &result),
+               "failed to get driver info level 8");
+
+       if (W_ERROR_EQUAL(result, WERR_INVALID_LEVEL)) {
+               goto try_level6;
+       }
+
+       driver_path     = strip_path(info.info8.driver_path);
+       data_file       = strip_path(info.info8.data_file);
+       config_file     = strip_path(info.info8.config_file);
+       help_file       = strip_path(info.info8.help_file);
+       dependent_files = strip_paths(info.info8.dependent_files);
+
+       driver_date             = driver_winreg_date(tctx, info.info8.driver_date);
+       inbox_driver_date       = driver_winreg_date(tctx, info.info8.min_inbox_driver_ver_date);
+
+       driver_version          = driver_winreg_version(tctx, info.info8.driver_version);
+       inbox_driver_version    = driver_winreg_version(tctx, info.info8.min_inbox_driver_ver_version);
+
+       test_sz("Configuration File",           config_file);
+       test_sz("Data File",                    data_file);
+       test_sz("Datatype",                     info.info8.default_datatype);
+       test_sz("Driver",                       driver_path);
+       test_sz("DriverDate",                   driver_date);
+       test_sz("DriverVersion",                driver_version);
+       test_sz("HardwareID",                   info.info8.hardware_id);
+       test_sz("Help File",                    help_file);
+       test_sz("InfPath",                      info.info8.inf_path);
+       test_sz("Manufacturer",                 info.info8.manufacturer_name);
+       test_sz("MinInboxDriverVerDate",        inbox_driver_date);
+       test_sz("MinInboxDriverVerVersion",     inbox_driver_version);
+       test_sz("Monitor",                      info.info8.monitor_name);
+       test_sz("OEM URL",                      info.info8.manufacturer_url);
+       test_sz("Print Processor",              info.info8.print_processor);
+       test_sz("Provider",                     info.info8.provider);
+       test_sz("VendorSetup",                  info.info8.vendor_setup);
+       test_multi_sz("ColorProfiles",          info.info8.color_profiles);
+       test_multi_sz("Dependent Files",        dependent_files);
+       test_multi_sz("CoreDependencies",       info.info8.core_driver_dependencies);
+       test_multi_sz("Previous Names",         info.info8.previous_names);
+/*     test_dword("Attributes",                ?); */
+       test_dword("PrinterDriverAttributes",   info.info8.printer_driver_attributes);
+       test_dword("Version",                   info.info8.version);
+/*     test_dword("TempDir",                   ?); */
+
+ try_level6:
+
+       torture_assert(tctx,
+               test_GetPrinterDriver2_level(tctx, b, handle, driver_name, environment, 6, 3, 0, &info, &result),
+               "failed to get driver info level 6");
+
+       driver_path     = strip_path(info.info6.driver_path);
+       data_file       = strip_path(info.info6.data_file);
+       config_file     = strip_path(info.info6.config_file);
+       help_file       = strip_path(info.info6.help_file);
+       dependent_files = strip_paths(info.info6.dependent_files);
+
+       driver_date             = driver_winreg_date(tctx, info.info6.driver_date);
+
+       driver_version          = driver_winreg_version(tctx, info.info6.driver_version);
+
+       test_sz("Configuration File",           config_file);
+       test_sz("Data File",                    data_file);
+       test_sz("Datatype",                     info.info6.default_datatype);
+       test_sz("Driver",                       driver_path);
+       test_sz("DriverDate",                   driver_date);
+       test_sz("DriverVersion",                driver_version);
+       test_sz("HardwareID",                   info.info6.hardware_id);
+       test_sz("Help File",                    help_file);
+       test_sz("Manufacturer",                 info.info6.manufacturer_name);
+       test_sz("Monitor",                      info.info6.monitor_name);
+       test_sz("OEM URL",                      info.info6.manufacturer_url);
+       test_sz("Provider",                     info.info6.provider);
+       test_multi_sz("Dependent Files",        dependent_files);
+       test_multi_sz("Previous Names",         info.info6.previous_names);
+/*     test_dword("Attributes",                ?); */
+       test_dword("Version",                   info.info6.version);
+/*     test_dword("TempDir",                   ?); */
+
+ try_level3:
+
+       torture_assert(tctx,
+               test_GetPrinterDriver2_level(tctx, b, handle, driver_name, environment, 3, 3, 0, &info, &result),
+               "failed to get driver info level 3");
+
+       driver_path     = strip_path(info.info3.driver_path);
+       data_file       = strip_path(info.info3.data_file);
+       config_file     = strip_path(info.info3.config_file);
+       help_file       = strip_path(info.info3.help_file);
+       dependent_files = strip_paths(info.info3.dependent_files);
+
+       test_sz("Configuration File",           config_file);
+       test_sz("Data File",                    data_file);
+       test_sz("Datatype",                     info.info3.default_datatype);
+       test_sz("Driver",                       driver_path);
+       test_sz("Help File",                    help_file);
+       test_sz("Monitor",                      info.info3.monitor_name);
+       test_multi_sz("Dependent Files",        dependent_files);
+/*     test_dword("Attributes",                ?); */
+       test_dword("Version",                   info.info3.version);
+/*     test_dword("TempDir",                   ?); */
+
+
+       torture_assert(tctx,
+               test_winreg_CloseKey(tctx, winreg_handle, &key_handle), "");
+
+       torture_comment(tctx, "Driver Info and winreg consistency test succeeded\n\n");
+
+       return true;
+}
+
+#undef test_sz
+#undef test_dword
+
+static bool test_SetPrinterData(struct torture_context *tctx,
+                               struct dcerpc_binding_handle *b,
+                               struct policy_handle *handle,
+                               const char *value_name,
+                               enum winreg_Type type,
+                               uint8_t *data,
+                               uint32_t offered)
+{
+       struct spoolss_SetPrinterData r;
+
+       r.in.handle = handle;
+       r.in.value_name = value_name;
+       r.in.type = type;
+       r.in.data = data;
+       r.in.offered = offered;
+
+       torture_comment(tctx, "Testing SetPrinterData(%s)\n",
+               r.in.value_name);
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_SetPrinterData_r(b, tctx, &r),
+               "SetPrinterData failed");
+       torture_assert_werr_ok(tctx, r.out.result,
+               "SetPrinterData failed");
+
+       return true;
+}
+
+static bool test_SetPrinterData_matrix(struct torture_context *tctx,
+                                      struct dcerpc_binding_handle *b,
+                                      struct policy_handle *handle,
+                                      const char *printer_name,
+                                      struct dcerpc_binding_handle *winreg_handle,
+                                      struct policy_handle *hive_handle)
+{
+       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;
 
        for (i=0; i < ARRAY_SIZE(values); i++) {
 
-               enum winreg_Type type;
+               enum winreg_Type type, expected_type = REG_SZ;
                DATA_BLOB blob;
                uint8_t *data;
                uint32_t needed;
 
-               torture_assert(tctx,
-                       reg_string_to_val(tctx, lp_iconv_convenience(tctx->lp_ctx),
-                                         "REG_SZ", "dog", &type, &blob), "");
+               torture_assert(tctx, push_reg_sz(tctx, &blob, "dog"), "");
+               type = REG_SZ;
 
                torture_assert(tctx,
                        test_SetPrinterData(tctx, b, handle, values[i], REG_SZ, blob.data, blob.length),
                        "SetPrinterData failed");
 
                torture_assert(tctx,
-                       test_GetPrinterData(tctx, b, handle, values[i], &type, &data, &needed),
+                       test_GetPrinterData_checktype(tctx, b, handle, values[i], &expected_type, &type, &data, &needed),
                        "GetPrinterData failed");
 
                torture_assert_int_equal(tctx, type, REG_SZ, "type mismatch");
@@ -3894,142 +4870,74 @@ static bool test_SetPrinterDataEx(struct torture_context *tctx,
        return true;
 }
 
-static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
-                                        struct dcerpc_pipe *p,
-                                        struct policy_handle *handle,
-                                        const char *printername,
-                                        struct dcerpc_binding_handle *winreg_handle,
-                                        struct policy_handle *hive_handle)
+static bool test_SetPrinterDataEx_keys(struct torture_context *tctx,
+                                      struct dcerpc_pipe *p,
+                                      struct policy_handle *handle)
 {
        struct dcerpc_binding_handle *b = p->binding_handle;
        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
-       };
-       enum winreg_Type types[] = {
-               REG_SZ,
-               REG_MULTI_SZ,
-               REG_DWORD,
-               REG_BINARY
+               "torture\\data,ex",
+               "torture/data",
+               "torture/data ex",
+               "torture/data ex/sub",
+               "torture//data",
+               "torture//data ex",
+               "torture//data ex/sub",
+               "torture//data ex//sub",
        };
-       const char *str = "abcdefghijklmnopqrstuvwxzy";
-       int i, t, s;
-
+       int i;
 
        for (i=0; i < ARRAY_SIZE(keys); i++) {
-       for (t=0; t < ARRAY_SIZE(types); t++) {
-       for (s=0; s < strlen(str); s++) {
 
                char *c;
                const char *key;
                enum winreg_Type type;
-               const char *string = talloc_strndup(tctx, str, s);
-               DATA_BLOB blob = data_blob_string_const(string);
+               DATA_BLOB blob_in, blob_out;
                const char **subkeys;
-               DATA_BLOB data;
-               uint8_t *data_out;
-               uint32_t needed, offered = 0;
                uint32_t ecount;
                struct spoolss_PrinterEnumValues *einfo;
+               uint32_t needed;
 
-               if (types[t] == REG_DWORD) {
-                       s = 0xffff;
-               }
-
-               if (torture_setting_bool(tctx, "samba3", false)) {
-                       if ((types[t] == REG_MULTI_SZ) && s == 0) {
-                               torture_warning(tctx, "samba3 does not handle 4 byte emtpy REG_MULTI_SZ buffers");
-                               continue;
-                       }
-               }
+               blob_in = data_blob_talloc(tctx, NULL, 42);
 
-               switch (types[t]) {
-               case REG_BINARY:
-                       data = blob;
-                       offered = blob.length;
-                       break;
-               case REG_DWORD:
-                       data = data_blob_talloc(tctx, NULL, 4);
-                       SIVAL(data.data, 0, 0x12345678);
-                       offered = 4;
-                       break;
-               case REG_SZ:
-                       torture_assert(tctx,
-                               reg_string_to_val(tctx, lp_iconv_convenience(tctx->lp_ctx),
-                                                 "REG_SZ", string, &type, &data), "");
-                       offered = data.length;
-                       /*strlen_m_term(data.string)*2;*/
-                       break;
-               case REG_MULTI_SZ:
-                       torture_assert(tctx,
-                               reg_string_to_val(tctx, lp_iconv_convenience(tctx->lp_ctx),
-                                                 "REG_SZ", string, &type, &data), "");
-                       torture_assert(tctx, data_blob_realloc(tctx, &data, data.length + 2), "");
-                       memset(&data.data[data.length - 2], '\0', 2);
-                       offered = data.length;
-                       break;
-               default:
-                       torture_fail(tctx, talloc_asprintf(tctx, "type %d untested\n", types[t]));
-               }
+               generate_random_buffer(blob_in.data, blob_in.length);
 
                torture_assert(tctx,
-                       test_SetPrinterDataEx(tctx, b, handle, keys[i], value_name, types[t], data.data, offered),
+                       test_SetPrinterDataEx(tctx, b, handle, keys[i], value_name, REG_BINARY, blob_in.data, blob_in.length),
                        "failed to call SetPrinterDataEx");
 
                torture_assert(tctx,
-                       test_GetPrinterDataEx(tctx, p, handle, keys[i], value_name, &type, &data_out, &needed),
+                       test_GetPrinterDataEx(tctx, p, handle, keys[i], value_name, &type, &blob_out.data, &needed),
                        "failed to call GetPrinterDataEx");
 
+               blob_out.length = needed;
                torture_assert(tctx,
                        test_EnumPrinterDataEx(tctx, b, handle, keys[i], &ecount, &einfo),
                        "failed to call EnumPrinterDataEx");
 
-               torture_assert_int_equal(tctx, types[t], type, "type mismatch");
-               torture_assert_int_equal(tctx, needed, offered, "size mismatch");
-               torture_assert_mem_equal(tctx, data_out, data.data, offered, "buffer mismatch");
+               torture_assert_int_equal(tctx, type, REG_BINARY, "type mismatch");
+               torture_assert_int_equal(tctx, blob_out.length, blob_in.length, "size mismatch");
+               torture_assert_mem_equal(tctx, blob_out.data, blob_in.data, blob_in.length, "buffer mismatch");
 
                torture_assert_int_equal(tctx, ecount, 1, "unexpected enum count");
                torture_assert_str_equal(tctx, einfo[0].value_name, value_name, "value_name mismatch");
                torture_assert_int_equal(tctx, einfo[0].value_name_len, strlen_m_term(value_name)*2, "unexpected value_name_len");
-               torture_assert_int_equal(tctx, einfo[0].type, types[t], "type mismatch");
-               torture_assert_int_equal(tctx, einfo[0].data_length, offered, "size mismatch");
+               torture_assert_int_equal(tctx, einfo[0].type, REG_BINARY, "type mismatch");
+               torture_assert_int_equal(tctx, einfo[0].data_length, blob_in.length, "size mismatch");
                if (einfo[0].data_length > 0) {
-                       torture_assert_mem_equal(tctx, einfo[0].data->data, data.data, offered, "buffer mismatch");
-               }
-
-               if (winreg_handle && hive_handle) {
-                       enum winreg_Type w_type;
-                       uint32_t w_size;
-                       uint32_t w_length;
-                       uint8_t *w_data;
-
-                       torture_assert(tctx,
-                               test_winreg_query_printerdata(tctx, winreg_handle, hive_handle,
-                                       printername, keys[i], value_name,
-                                       &w_type, &w_size, &w_length, &w_data), "");
-
-                       torture_assert_int_equal(tctx, w_type, types[t], "winreg type mismatch");
-                       torture_assert_int_equal(tctx, w_size, offered, "winreg size mismatch");
-                       torture_assert_int_equal(tctx, w_length, offered, "winreg length mismatch");
-                       torture_assert_mem_equal(tctx, w_data, data.data, offered, "winreg buffer mismatch");
+                       torture_assert_mem_equal(tctx, einfo[0].data->data, blob_in.data, blob_in.length, "buffer mismatch");
                }
 
                key = talloc_strdup(tctx, keys[i]);
@@ -4069,27 +4977,213 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
                        }
                }
        }
-       }
-       }
 
        return true;
 }
 
-static bool test_PrinterData_winreg(struct torture_context *tctx,
-                                   struct dcerpc_pipe *p,
-                                   struct policy_handle *handle,
-                                   const char *printer_name)
+static bool test_SetPrinterDataEx_values(struct torture_context *tctx,
+                                        struct dcerpc_pipe *p,
+                                        struct policy_handle *handle)
 {
        struct dcerpc_binding_handle *b = p->binding_handle;
-       struct dcerpc_pipe *p2;
-       bool ret = true;
-       struct policy_handle hive_handle;
-       struct dcerpc_binding_handle *b2;
+       const char *key = "torturedataex";
+       const char *values[] = {
+               "torture_value",
+               "torture value",
+               "torture,value",
+               "torture/value",
+               "torture\\value",
+               "torture\\\\value"
+       };
+       int i;
 
-       torture_assert_ntstatus_ok(tctx,
-               torture_rpc_connection(tctx, &p2, &ndr_table_winreg),
-               "could not open winreg pipe");
-       b2 = p2->binding_handle;
+       for (i=0; i < ARRAY_SIZE(values); i++) {
+
+               enum winreg_Type type;
+               DATA_BLOB blob_in, blob_out;
+               uint32_t ecount;
+               struct spoolss_PrinterEnumValues *einfo;
+               uint32_t needed;
+
+               if (torture_setting_bool(tctx, "samba3", false)) {
+                       char *q;
+                       q = strrchr(values[i], ',');
+                       if (q) {
+                               torture_comment(tctx, "skipping valuename '%s' including ',' character against Samba3\n",
+                                               values[i]);
+                               continue;
+                       }
+               }
+
+               blob_in = data_blob_talloc(tctx, NULL, 42);
+
+               generate_random_buffer(blob_in.data, blob_in.length);
+
+               torture_assert(tctx,
+                       test_SetPrinterDataEx(tctx, b, handle, key, values[i], REG_BINARY, blob_in.data, blob_in.length),
+                       "failed to call SetPrinterDataEx");
+
+               torture_assert(tctx,
+                       test_GetPrinterDataEx(tctx, p, handle, key, values[i], &type, &blob_out.data, &needed),
+                       "failed to call GetPrinterDataEx");
+
+               blob_out.length = needed;
+               torture_assert(tctx,
+                       test_EnumPrinterDataEx(tctx, b, handle, key, &ecount, &einfo),
+                       "failed to call EnumPrinterDataEx");
+
+               torture_assert_int_equal(tctx, type, REG_BINARY, "type mismatch");
+               torture_assert_int_equal(tctx, blob_out.length, blob_in.length, "size mismatch");
+               torture_assert_mem_equal(tctx, blob_out.data, blob_in.data, blob_in.length, "buffer mismatch");
+
+               torture_assert_int_equal(tctx, ecount, 1, "unexpected enum count");
+               torture_assert_str_equal(tctx, einfo[0].value_name, values[i], "value_name mismatch");
+               torture_assert_int_equal(tctx, einfo[0].value_name_len, strlen_m_term(values[i])*2, "unexpected value_name_len");
+               torture_assert_int_equal(tctx, einfo[0].type, REG_BINARY, "type mismatch");
+               torture_assert_int_equal(tctx, einfo[0].data_length, blob_in.length, "size mismatch");
+               if (einfo[0].data_length > 0) {
+                       torture_assert_mem_equal(tctx, einfo[0].data->data, blob_in.data, blob_in.length, "buffer mismatch");
+               }
+
+               torture_assert(tctx,
+                       test_DeletePrinterDataEx(tctx, b, handle, key, values[i]),
+                       "failed to call DeletePrinterDataEx");
+       }
+
+       return true;
+}
+
+
+static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
+                                        struct dcerpc_pipe *p,
+                                        struct policy_handle *handle,
+                                        const char *printername,
+                                        struct dcerpc_binding_handle *winreg_handle,
+                                        struct policy_handle *hive_handle)
+{
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       const char *value_name = "dog";
+       const char *key_name = "torturedataex";
+       enum winreg_Type types[] = {
+               REG_SZ,
+               REG_MULTI_SZ,
+               REG_DWORD,
+               REG_BINARY
+       };
+       const char *str = "abcdefghi";
+       int t, s;
+
+       for (t=0; t < ARRAY_SIZE(types); t++) {
+       for (s=0; s < strlen(str); s++) {
+
+               enum winreg_Type type;
+               const char *string = talloc_strndup(tctx, str, s);
+               const char *array[2];
+               DATA_BLOB blob = data_blob_string_const(string);
+               DATA_BLOB data;
+               uint8_t *data_out;
+               uint32_t needed, offered = 0;
+               uint32_t ecount;
+               struct spoolss_PrinterEnumValues *einfo;
+
+               array[0] = talloc_strdup(tctx, string);
+               array[1] = NULL;
+
+               if (types[t] == REG_DWORD) {
+                       s = 0xffff;
+               }
+
+               switch (types[t]) {
+               case REG_BINARY:
+                       data = blob;
+                       offered = blob.length;
+                       break;
+               case REG_DWORD:
+                       data = data_blob_talloc(tctx, NULL, 4);
+                       SIVAL(data.data, 0, 0x12345678);
+                       offered = 4;
+                       break;
+               case REG_SZ:
+                       torture_assert(tctx, push_reg_sz(tctx, &data, string), "");
+                       type = REG_SZ;
+                       offered = data.length;
+                       /*strlen_m_term(data.string)*2;*/
+                       break;
+               case REG_MULTI_SZ:
+                       torture_assert(tctx, push_reg_multi_sz(tctx, &data, array), "");
+                       type = REG_MULTI_SZ;
+                       offered = data.length;
+                       break;
+               default:
+                       torture_fail(tctx, talloc_asprintf(tctx, "type %d untested\n", types[t]));
+               }
+
+               torture_assert(tctx,
+                       test_SetPrinterDataEx(tctx, b, handle, key_name, value_name, types[t], data.data, offered),
+                       "failed to call SetPrinterDataEx");
+
+               torture_assert(tctx,
+                       test_GetPrinterDataEx_checktype(tctx, p, handle, key_name, value_name, &types[t], &type, &data_out, &needed),
+                       "failed to call GetPrinterDataEx");
+
+               torture_assert(tctx,
+                       test_EnumPrinterDataEx(tctx, b, handle, key_name, &ecount, &einfo),
+                       "failed to call EnumPrinterDataEx");
+
+               torture_assert_int_equal(tctx, types[t], type, "type mismatch");
+               torture_assert_int_equal(tctx, needed, offered, "size mismatch");
+               torture_assert_mem_equal(tctx, data_out, data.data, offered, "buffer mismatch");
+
+               torture_assert_int_equal(tctx, ecount, 1, "unexpected enum count");
+               torture_assert_str_equal(tctx, einfo[0].value_name, value_name, "value_name mismatch");
+               torture_assert_int_equal(tctx, einfo[0].value_name_len, strlen_m_term(value_name)*2, "unexpected value_name_len");
+               torture_assert_int_equal(tctx, einfo[0].type, types[t], "type mismatch");
+               torture_assert_int_equal(tctx, einfo[0].data_length, offered, "size mismatch");
+               if (einfo[0].data_length > 0) {
+                       torture_assert_mem_equal(tctx, einfo[0].data->data, data.data, offered, "buffer mismatch");
+               }
+
+               if (winreg_handle && hive_handle) {
+                       enum winreg_Type w_type;
+                       uint32_t w_size;
+                       uint32_t w_length;
+                       uint8_t *w_data;
+
+                       torture_assert(tctx,
+                               test_winreg_query_printerdata(tctx, winreg_handle, hive_handle,
+                                       printername, key_name, value_name,
+                                       &w_type, &w_size, &w_length, &w_data), "");
+
+                       torture_assert_int_equal(tctx, w_type, types[t], "winreg type mismatch");
+                       torture_assert_int_equal(tctx, w_size, offered, "winreg size mismatch");
+                       torture_assert_int_equal(tctx, w_length, offered, "winreg length mismatch");
+                       torture_assert_mem_equal(tctx, w_data, data.data, offered, "winreg buffer mismatch");
+               }
+
+               torture_assert(tctx,
+                       test_DeletePrinterDataEx(tctx, b, handle, key_name, value_name),
+                       "failed to call DeletePrinterDataEx");
+       }
+       }
+
+       return true;
+}
+
+static bool test_PrinterData_winreg(struct torture_context *tctx,
+                                   struct dcerpc_pipe *p,
+                                   struct policy_handle *handle,
+                                   const char *printer_name)
+{
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       struct dcerpc_pipe *p2;
+       bool ret = true;
+       struct policy_handle hive_handle;
+       struct dcerpc_binding_handle *b2;
+
+       torture_assert_ntstatus_ok(tctx,
+               torture_rpc_connection(tctx, &p2, &ndr_table_winreg),
+               "could not open winreg pipe");
+       b2 = p2->binding_handle;
 
        torture_assert(tctx, test_winreg_OpenHKLM(tctx, b2, &hive_handle), "");
 
@@ -4130,77 +5224,292 @@ static bool test_Forms_winreg(struct torture_context *tctx,
        return ret;
 }
 
-static bool test_GetChangeID_PrinterData(struct torture_context *tctx,
-                                        struct dcerpc_binding_handle *b,
-                                        struct policy_handle *handle,
-                                        uint32_t *change_id)
+static bool test_PrinterInfo_winreg(struct torture_context *tctx,
+                                   struct dcerpc_pipe *p,
+                                   struct policy_handle *handle,
+                                   const char *printer_name)
 {
-       enum winreg_Type type;
-       uint8_t *data;
-       uint32_t needed;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       struct dcerpc_pipe *p2;
+       bool ret = true;
+       struct policy_handle hive_handle;
+       struct dcerpc_binding_handle *b2;
 
-       torture_assert(tctx,
-               test_GetPrinterData(tctx, b, handle, "ChangeID", &type, &data, &needed),
-               "failed to call GetPrinterData");
+       torture_assert_ntstatus_ok(tctx,
+               torture_rpc_connection(tctx, &p2, &ndr_table_winreg),
+               "could not open winreg pipe");
+       b2 = p2->binding_handle;
 
-       torture_assert(tctx, type == REG_DWORD, "unexpected type");
-       torture_assert_int_equal(tctx, needed, 4, "unexpected size");
+       torture_assert(tctx, test_winreg_OpenHKLM(tctx, b2, &hive_handle), "");
 
-       *change_id = IVAL(data, 0);
+       ret = test_GetPrinterInfo_winreg(tctx, b, handle, printer_name, b2, &hive_handle);
 
-       return true;
+       test_winreg_CloseKey(tctx, b2, &hive_handle);
+
+       talloc_free(p2);
+
+       return ret;
 }
 
-static bool test_GetChangeID_PrinterDataEx(struct torture_context *tctx,
-                                          struct dcerpc_pipe *p,
-                                          struct policy_handle *handle,
-                                          uint32_t *change_id)
+static bool test_DriverInfo_winreg(struct torture_context *tctx,
+                                  struct dcerpc_pipe *p,
+                                  struct policy_handle *handle,
+                                  const char *printer_name,
+                                  const char *driver_name,
+                                  const char *environment)
 {
-       enum winreg_Type type;
-       uint8_t *data;
-       uint32_t needed;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       struct dcerpc_pipe *p2;
+       bool ret = true;
+       struct policy_handle hive_handle;
+       struct dcerpc_binding_handle *b2;
 
-       torture_assert(tctx,
-               test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", "ChangeID", &type, &data, &needed),
-               "failed to call GetPrinterData");
+       torture_assert_ntstatus_ok(tctx,
+               torture_rpc_connection(tctx, &p2, &ndr_table_winreg),
+               "could not open winreg pipe");
+       b2 = p2->binding_handle;
 
-       torture_assert(tctx, type == REG_DWORD, "unexpected type");
-       torture_assert_int_equal(tctx, needed, 4, "unexpected size");
+       torture_assert(tctx, test_winreg_OpenHKLM(tctx, b2, &hive_handle), "");
 
-       *change_id = IVAL(data, 0);
+       ret = test_GetDriverInfo_winreg(tctx, b, handle, printer_name, driver_name, environment, b2, &hive_handle);
 
-       return true;
+       test_winreg_CloseKey(tctx, b2, &hive_handle);
+
+       talloc_free(p2);
+
+       return ret;
 }
 
-static bool test_GetChangeID_PrinterInfo(struct torture_context *tctx,
-                                        struct dcerpc_binding_handle *b,
-                                        struct policy_handle *handle,
-                                        uint32_t *change_id)
+static bool test_PrintProcessors_winreg(struct torture_context *tctx,
+                                       struct dcerpc_binding_handle *b,
+                                       const char *environment)
 {
-       union spoolss_PrinterInfo info;
+       struct dcerpc_pipe *p2;
+       bool ret = true;
+       struct policy_handle hive_handle;
+       struct dcerpc_binding_handle *b2;
 
-       torture_assert(tctx, test_GetPrinter_level(tctx, b, handle, 0, &info),
-               "failed to query Printer level 0");
+       torture_assert_ntstatus_ok(tctx,
+               torture_rpc_connection(tctx, &p2, &ndr_table_winreg),
+               "could not open winreg pipe");
+       b2 = p2->binding_handle;
 
-       *change_id = info.info0.change_id;
+       torture_assert(tctx, test_winreg_OpenHKLM(tctx, b2, &hive_handle), "");
 
-       return true;
+       ret = test_PrintProcessors(tctx, b, environment, b2, &hive_handle);
+
+       test_winreg_CloseKey(tctx, b2, &hive_handle);
+
+       talloc_free(p2);
+
+       return ret;
 }
 
-static bool test_ChangeID(struct torture_context *tctx,
-                         struct dcerpc_pipe *p,
-                         struct policy_handle *handle)
+static bool test_PrinterData_DsSpooler(struct torture_context *tctx,
+                                      struct dcerpc_pipe *p,
+                                      struct policy_handle *handle,
+                                      const char *printer_name)
 {
-       uint32_t change_id, change_id_ex, change_id_info;
-       uint32_t change_id2, change_id_ex2, change_id_info2;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+       union spoolss_SetPrinterInfo sinfo;
        union spoolss_PrinterInfo info;
-       const char *comment;
        struct dcerpc_binding_handle *b = p->binding_handle;
+       const char *pname;
 
-       torture_comment(tctx, "Testing ChangeID: id change test #1\n");
+       ZERO_STRUCT(info_ctr);
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
 
-       torture_assert(tctx, test_GetChangeID_PrinterData(tctx, b, handle, &change_id),
-               "failed to query for ChangeID");
+       torture_comment(tctx, "Testing DsSpooler <-> SetPrinter relations\n");
+
+       torture_assert(tctx,
+               test_GetPrinter_level(tctx, b, handle, 2, &info),
+               "failed to query Printer level 2");
+
+       torture_assert(tctx,
+               PrinterInfo_to_SetPrinterInfo(tctx, &info, 2, &sinfo),
+               "failed to convert");
+
+       info_ctr.level = 2;
+       info_ctr.info = sinfo;
+
+#define TEST_SZ(wname, iname) \
+do {\
+       enum winreg_Type type;\
+       uint8_t *data;\
+       uint32_t needed;\
+       DATA_BLOB blob;\
+       const char *str;\
+       torture_assert(tctx,\
+               test_GetPrinterDataEx(tctx, p, handle, "DsSpooler", wname, &type, &data, &needed),\
+               "failed to query");\
+       torture_assert_int_equal(tctx, type, REG_SZ, "unexpected type");\
+       blob = data_blob_const(data, needed);\
+       torture_assert(tctx,\
+               pull_reg_sz(tctx, &blob, &str),\
+               "failed to pull REG_SZ");\
+       torture_assert_str_equal(tctx, str, iname, "unexpected result");\
+} while(0);
+
+
+#define TEST_SET_SZ(wname, iname, val) \
+do {\
+       enum winreg_Type type;\
+       uint8_t *data;\
+       uint32_t needed;\
+       DATA_BLOB blob;\
+       const char *str;\
+       sinfo.info2->iname = val;\
+       torture_assert(tctx,\
+               test_SetPrinter(tctx, b, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0),\
+               "failed to call SetPrinter");\
+       torture_assert(tctx,\
+               test_GetPrinterDataEx(tctx, p, handle, "DsSpooler", wname, &type, &data, &needed),\
+               "failed to query");\
+       torture_assert_int_equal(tctx, type, REG_SZ, "unexpected type");\
+       blob = data_blob_const(data, needed);\
+       torture_assert(tctx,\
+               pull_reg_sz(tctx, &blob, &str),\
+               "failed to pull REG_SZ");\
+       torture_assert_str_equal(tctx, str, val, "unexpected result");\
+} while(0);
+
+#define TEST_SET_DWORD(wname, iname, val) \
+do {\
+       enum winreg_Type type;\
+       uint8_t *data;\
+       uint32_t needed;\
+       uint32_t value;\
+       sinfo.info2->iname = val;\
+       torture_assert(tctx,\
+               test_SetPrinter(tctx, b, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0),\
+               "failed to call SetPrinter");\
+       torture_assert(tctx,\
+               test_GetPrinterDataEx(tctx, p, handle, "DsSpooler", wname, &type, &data, &needed),\
+               "failed to query");\
+       torture_assert_int_equal(tctx, type, REG_DWORD, "unexpected type");\
+       torture_assert_int_equal(tctx, needed, 4, "unexpected length");\
+       value = IVAL(data, 0); \
+       torture_assert_int_equal(tctx, value, val, "unexpected result");\
+} while(0);
+
+       TEST_SET_SZ("description", comment, "newval");
+       TEST_SET_SZ("location", location, "newval");
+/*     TEST_SET_DWORD("priority", priority, 25); */
+
+       torture_assert(tctx,
+               test_GetPrinter_level(tctx, b, handle, 2, &info),
+               "failed to query Printer level 2");
+
+       TEST_SZ("description", info.info2.comment);
+       TEST_SZ("driverName", info.info2.drivername);
+       TEST_SZ("location", info.info2.location);
+
+       pname = strrchr(info.info2.printername, '\\');
+       if (pname == NULL) {
+               pname = info.info2.printername;
+       } else {
+               pname++;
+       }
+       TEST_SZ("printerName", pname);
+       /* TEST_SZ("printSeparatorFile", info.info2.sepfile); */
+       /* TEST_SZ("printShareName", info.info2.sharename); */
+
+       /* FIXME gd: complete the list */
+
+#undef TEST_SZ
+#undef TEST_SET_SZ
+#undef TEST_DWORD
+
+       torture_comment(tctx, "DsSpooler <-> SetPrinter relations test succeeded\n\n");
+
+       return true;
+}
+
+static bool test_print_processors_winreg(struct torture_context *tctx,
+                                        void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       return test_PrintProcessors_winreg(tctx, b, ctx->environment);
+}
+
+static bool test_GetChangeID_PrinterData(struct torture_context *tctx,
+                                        struct dcerpc_binding_handle *b,
+                                        struct policy_handle *handle,
+                                        uint32_t *change_id)
+{
+       enum winreg_Type type;
+       uint8_t *data;
+       uint32_t needed;
+
+       torture_assert(tctx,
+               test_GetPrinterData(tctx, b, handle, "ChangeID", &type, &data, &needed),
+               "failed to call GetPrinterData");
+
+       torture_assert(tctx, type == REG_DWORD, "unexpected type");
+       torture_assert_int_equal(tctx, needed, 4, "unexpected size");
+
+       *change_id = IVAL(data, 0);
+
+       return true;
+}
+
+static bool test_GetChangeID_PrinterDataEx(struct torture_context *tctx,
+                                          struct dcerpc_pipe *p,
+                                          struct policy_handle *handle,
+                                          uint32_t *change_id)
+{
+       enum winreg_Type type;
+       uint8_t *data;
+       uint32_t needed;
+
+       torture_assert(tctx,
+               test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", "ChangeID", &type, &data, &needed),
+               "failed to call GetPrinterData");
+
+       torture_assert(tctx, type == REG_DWORD, "unexpected type");
+       torture_assert_int_equal(tctx, needed, 4, "unexpected size");
+
+       *change_id = IVAL(data, 0);
+
+       return true;
+}
+
+static bool test_GetChangeID_PrinterInfo(struct torture_context *tctx,
+                                        struct dcerpc_binding_handle *b,
+                                        struct policy_handle *handle,
+                                        uint32_t *change_id)
+{
+       union spoolss_PrinterInfo info;
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, b, handle, 0, &info),
+               "failed to query Printer level 0");
+
+       *change_id = info.info0.change_id;
+
+       return true;
+}
+
+static bool test_ChangeID(struct torture_context *tctx,
+                         struct dcerpc_pipe *p,
+                         struct policy_handle *handle)
+{
+       uint32_t change_id, change_id_ex, change_id_info;
+       uint32_t change_id2, change_id_ex2, change_id_info2;
+       union spoolss_PrinterInfo info;
+       const char *comment;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       torture_comment(tctx, "Testing ChangeID: id change test #1\n");
+
+       torture_assert(tctx, test_GetChangeID_PrinterData(tctx, b, handle, &change_id),
+               "failed to query for ChangeID");
        torture_assert(tctx, test_GetChangeID_PrinterDataEx(tctx, p, handle, &change_id_ex),
                "failed to query for ChangeID");
        torture_assert(tctx, test_GetChangeID_PrinterInfo(tctx, b, handle, &change_id_info),
@@ -4308,7 +5617,7 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx,
                return true;
        }
 
-       torture_comment(tctx, "testing close on secondary pipe\n");
+       torture_comment(tctx, "Testing close on secondary pipe\n");
 
        status = dcerpc_parse_binding(tctx, p->conn->binding_string, &b);
        torture_assert_ntstatus_ok(tctx, status, "Failed to parse dcerpc binding");
@@ -4323,12 +5632,9 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx,
        cp.out.handle = handle;
 
        status = dcerpc_spoolss_ClosePrinter_r(p2->binding_handle, tctx, &cp);
-       torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NET_WRITE_FAULT,
+       torture_assert_ntstatus_equal(tctx, status, NT_STATUS_RPC_SS_CONTEXT_MISMATCH,
                        "ERROR: Allowed close on secondary connection");
 
-       torture_assert_int_equal(tctx, p2->last_fault_code, DCERPC_FAULT_CONTEXT_MISMATCH,
-                                "Unexpected fault code");
-
        talloc_free(p2);
 
        return true;
@@ -4382,10 +5688,49 @@ static bool test_OpenPrinter_badname(struct torture_context *tctx,
        return ret;
 }
 
+static bool test_OpenPrinter_badname_list(struct torture_context *tctx,
+                                         void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+
+       const char *badnames[] = {
+               "__INVALID_PRINTER__",
+               "\\\\__INVALID_HOST__",
+               "",
+               "\\\\\\",
+               "\\\\\\__INVALID_PRINTER__"
+       };
+       const char *badname;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       const char *server_name = dcerpc_server_name(p);
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       int i;
+
+       for (i=0; i < ARRAY_SIZE(badnames); i++) {
+               torture_assert(tctx,
+                       test_OpenPrinter_badname(tctx, b, badnames[i]),
+                       "");
+       }
+
+       badname = talloc_asprintf(tctx, "\\\\%s\\", server_name);
+       torture_assert(tctx,
+               test_OpenPrinter_badname(tctx, b, badname),
+               "");
+
+       badname = talloc_asprintf(tctx, "\\\\%s\\__INVALID_PRINTER__", server_name);
+       torture_assert(tctx,
+               test_OpenPrinter_badname(tctx, b, badname),
+               "");
+
+       return true;
+}
+
 static bool test_OpenPrinter(struct torture_context *tctx,
                             struct dcerpc_pipe *p,
                             const char *name,
-                            const char *environment)
+                            const char *environment,
+                            bool open_only)
 {
        NTSTATUS status;
        struct spoolss_OpenPrinter r;
@@ -4393,7 +5738,7 @@ static bool test_OpenPrinter(struct torture_context *tctx,
        bool ret = true;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
-       r.in.printername        = talloc_asprintf(tctx, "\\\\%s\\%s", dcerpc_server_name(p), name);
+       r.in.printername        = name;
        r.in.datatype           = NULL;
        r.in.devmode_ctr.devmode= NULL;
        r.in.access_mask        = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -4407,6 +5752,10 @@ static bool test_OpenPrinter(struct torture_context *tctx,
 
        torture_assert_werr_ok(tctx, r.out.result, "OpenPrinter failed");
 
+       if (open_only) {
+               goto close_printer;
+       }
+
        if (!test_GetPrinter(tctx, b, &handle, environment)) {
                ret = false;
        }
@@ -4417,6 +5766,7 @@ static bool test_OpenPrinter(struct torture_context *tctx,
                }
        }
 
+ close_printer:
        if (!test_ClosePrinter(tctx, b, &handle)) {
                ret = false;
        }
@@ -4424,32 +5774,49 @@ static bool test_OpenPrinter(struct torture_context *tctx,
        return ret;
 }
 
+static bool test_OpenPrinterEx(struct torture_context *tctx,
+                              struct dcerpc_binding_handle *b,
+                              const char *printername,
+                              const char *datatype,
+                              struct spoolss_DeviceMode *devmode,
+                              uint32_t access_mask,
+                              uint32_t level,
+                              union spoolss_UserLevel *userlevel,
+                              struct policy_handle *handle,
+                              WERROR expected_result)
+{
+       struct spoolss_OpenPrinterEx r;
+
+       r.in.printername        = printername;
+       r.in.datatype           = datatype;
+       r.in.devmode_ctr.devmode= devmode;
+       r.in.access_mask        = access_mask;
+       r.in.level              = level;
+       r.in.userlevel          = *userlevel;
+       r.out.handle            = handle;
+
+       torture_comment(tctx, "Testing OpenPrinterEx(%s)\n", r.in.printername);
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_OpenPrinterEx_r(b, tctx, &r),
+               "OpenPrinterEx failed");
+
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "OpenPrinterEx failed");
+
+       return true;
+}
+
 static bool call_OpenPrinterEx(struct torture_context *tctx,
                               struct dcerpc_pipe *p,
                               const char *name,
                               struct spoolss_DeviceMode *devmode,
                               struct policy_handle *handle)
 {
-       struct spoolss_OpenPrinterEx r;
+       union spoolss_UserLevel userlevel;
        struct spoolss_UserLevel1 userlevel1;
-       NTSTATUS status;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
-       if (name && name[0]) {
-               r.in.printername = talloc_asprintf(tctx, "\\\\%s\\%s",
-                                                  dcerpc_server_name(p), name);
-       } else {
-               r.in.printername = talloc_asprintf(tctx, "\\\\%s",
-                                                  dcerpc_server_name(p));
-       }
-
-       r.in.datatype           = NULL;
-       r.in.devmode_ctr.devmode= devmode;
-       r.in.access_mask        = SEC_FLAG_MAXIMUM_ALLOWED;
-       r.in.level              = 1;
-       r.in.userlevel.level1   = &userlevel1;
-       r.out.handle = handle;
-
        userlevel1.size = 1234;
        userlevel1.client = "hello";
        userlevel1.user = "spottyfoot!";
@@ -4458,22 +5825,23 @@ static bool call_OpenPrinterEx(struct torture_context *tctx,
        userlevel1.minor = 3;
        userlevel1.processor = 4;
 
-       torture_comment(tctx, "Testing OpenPrinterEx(%s)\n", r.in.printername);
-
-       status = dcerpc_spoolss_OpenPrinterEx_r(b, tctx, &r);
-
-       torture_assert_ntstatus_ok(tctx, status, "OpenPrinterEx failed");
-
-       torture_assert_werr_ok(tctx, r.out.result, "OpenPrinterEx failed");
+       userlevel.level1 = &userlevel1;
 
-       return true;
+       return test_OpenPrinterEx(tctx, b, name, NULL, devmode,
+                                 SEC_FLAG_MAXIMUM_ALLOWED,
+                                 1,
+                                 &userlevel,
+                                 handle,
+                                 WERR_OK);
 }
 
 static bool test_printer_rename(struct torture_context *tctx,
-                               struct dcerpc_pipe *p,
-                               struct policy_handle *handle,
-                               const char *name)
+                               void *private_data)
 {
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
        bool ret = true;
        union spoolss_PrinterInfo info;
        union spoolss_SetPrinterInfo sinfo;
@@ -4493,7 +5861,7 @@ static bool test_printer_rename(struct torture_context *tctx,
        torture_comment(tctx, "Testing Printer rename operations\n");
 
        torture_assert(tctx,
-               test_GetPrinter_level(tctx, b, handle, 2, &info),
+               test_GetPrinter_level(tctx, b, &t->handle, 2, &info),
                "failed to call GetPrinter level 2");
 
        printer_name_orig = talloc_strdup(tctx, info.info2.printername);
@@ -4513,11 +5881,11 @@ static bool test_printer_rename(struct torture_context *tctx,
        info_ctr.info = sinfo;
 
        torture_assert(tctx,
-               test_SetPrinter(tctx, b, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0),
+               test_SetPrinter(tctx, b, &t->handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0),
                "failed to call SetPrinter level 2");
 
        torture_assert(tctx,
-               test_GetPrinter_level(tctx, b, handle, 2, &info),
+               test_GetPrinter_level(tctx, b, &t->handle, 2, &info),
                "failed to call GetPrinter level 2");
 
        printer_name = talloc_strdup(tctx, info.info2.printername);
@@ -4550,11 +5918,7 @@ static bool test_printer_rename(struct torture_context *tctx,
                test_GetPrinter_level(tctx, b, &new_handle, 2, &info),
                "failed to call GetPrinter level 2");
 
-       /* FIXME: we openend with servername! */
-       printer_name = talloc_asprintf(tctx, "\\\\%s\\%s",
-               dcerpc_server_name(p), printer_name_new);
-
-       torture_assert_str_equal(tctx, info.info2.printername, printer_name,
+       torture_assert_str_equal(tctx, info.info2.printername, printer_name_new,
                "new printer name was not set");
 
        torture_assert(tctx,
@@ -4566,16 +5930,132 @@ static bool test_printer_rename(struct torture_context *tctx,
        return ret;
 }
 
+static bool test_openprinter(struct torture_context *tctx,
+                            struct dcerpc_binding_handle *b,
+                            const char *real_printername)
+{
+       union spoolss_UserLevel userlevel;
+       struct policy_handle handle;
+       struct spoolss_UserLevel1 userlevel1;
+       const char *printername = NULL;
+       int i;
 
-static bool test_OpenPrinterEx(struct torture_context *tctx,
-                              struct dcerpc_pipe *p,
-                              const char *name,
-                              const char *environment)
+       struct {
+               const char *suffix;
+               WERROR expected_result;
+       } tests[] = {
+               {
+                       .suffix                 = "rubbish",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ", LocalOnl",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ", localOnly",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ", localonl",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ",LocalOnl",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ",localOnl2",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ", DrvConver2t",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ", drvconvert",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ",drvconvert",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ", DrvConvert",
+                       .expected_result        = WERR_OK
+               },{
+                       .suffix                 = " , DrvConvert",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ",DrvConvert",
+                       .expected_result        = WERR_OK
+               },{
+                       .suffix                 = ", DrvConvertsadfasdf",
+                       .expected_result        = WERR_OK
+               },{
+                       .suffix                 = ",DrvConvertasdfasd",
+                       .expected_result        = WERR_OK
+               },{
+                       .suffix                 = ", LocalOnly",
+                       .expected_result        = WERR_OK
+               },{
+                       .suffix                 = " , LocalOnly",
+                       .expected_result        = WERR_INVALID_PRINTER_NAME
+               },{
+                       .suffix                 = ",LocalOnly",
+                       .expected_result        = WERR_OK
+               },{
+                       .suffix                 = ", LocalOnlysagi4gjfkd",
+                       .expected_result        = WERR_OK
+               },{
+                       .suffix                 = ",LocalOnlysagi4gjfkd",
+                       .expected_result        = WERR_OK
+               }
+       };
+
+       userlevel1.size = 1234;
+       userlevel1.client = "hello";
+       userlevel1.user = "spottyfoot!";
+       userlevel1.build = 1;
+       userlevel1.major = 2;
+       userlevel1.minor = 3;
+       userlevel1.processor = 4;
+
+       userlevel.level1 = &userlevel1;
+
+       torture_comment(tctx, "Testing openprinterex printername pattern\n");
+
+       torture_assert(tctx,
+               test_OpenPrinterEx(tctx, b, real_printername, NULL, NULL, 0, 1,
+                                  &userlevel, &handle,
+                                  WERR_OK),
+               "OpenPrinterEx failed");
+       test_ClosePrinter(tctx, b, &handle);
+
+       for (i=0; i < ARRAY_SIZE(tests); i++) {
+
+               printername = talloc_asprintf(tctx, "%s%s",
+                                             real_printername,
+                                             tests[i].suffix);
+
+               torture_assert(tctx,
+                       test_OpenPrinterEx(tctx, b, printername, NULL, NULL, 0, 1,
+                                          &userlevel, &handle,
+                                          tests[i].expected_result),
+                       "OpenPrinterEx failed");
+               if (W_ERROR_IS_OK(tests[i].expected_result)) {
+                       test_ClosePrinter(tctx, b, &handle);
+               }
+       }
+
+       return true;
+}
+
+
+static bool test_existing_printer_openprinterex(struct torture_context *tctx,
+                                               struct dcerpc_pipe *p,
+                                               const char *name,
+                                               const char *environment)
 {
        struct policy_handle handle;
        bool ret = true;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
+       if (!test_openprinter(tctx, b, name)) {
+               return false;
+       }
+
        if (!call_OpenPrinterEx(tctx, p, name, NULL, &handle)) {
                return false;
        }
@@ -4612,7 +6092,7 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
                ret = false;
        }
 
-       if (!test_printer_keys(tctx, b, &handle)) {
+       if (!test_printer_all_keys(tctx, b, &handle)) {
                ret = false;
        }
 
@@ -4650,14 +6130,16 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
 }
 
 static bool test_EnumPrinters_old(struct torture_context *tctx,
-                                 struct dcerpc_pipe *p,
-                                 const char *environment)
+                                 void *private_data)
 {
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
        struct spoolss_EnumPrinters r;
        NTSTATUS status;
        uint16_t levels[] = {1, 2, 4, 5};
        int i;
        bool ret = true;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -4681,8 +6163,7 @@ static bool test_EnumPrinters_old(struct torture_context *tctx,
                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, needed);
-                       data_blob_clear(&blob);
+                       DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                        r.in.buffer = &blob;
                        r.in.offered = needed;
                        status = dcerpc_spoolss_EnumPrinters_r(b, tctx, &r);
@@ -4692,7 +6173,7 @@ static bool test_EnumPrinters_old(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrinters failed");
 
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinters, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinters, info, r.in.level, count, needed, 4);
 
                if (!info) {
                        torture_comment(tctx, "No printers returned\n");
@@ -4702,7 +6183,7 @@ static bool test_EnumPrinters_old(struct torture_context *tctx,
                for (j=0;j<count;j++) {
                        if (r.in.level == 1) {
                                char *unc = talloc_strdup(tctx, info[j].info1.name);
-                               char *slash, *name;
+                               char *slash, *name, *full_name;
                                name = unc;
                                if (unc[0] == '\\' && unc[1] == '\\') {
                                        unc +=2;
@@ -4712,10 +6193,18 @@ static bool test_EnumPrinters_old(struct torture_context *tctx,
                                        slash++;
                                        name = slash;
                                }
-                               if (!test_OpenPrinter(tctx, p, name, environment)) {
+                               full_name = talloc_asprintf(tctx, "\\\\%s\\%s",
+                                                           dcerpc_server_name(p), name);
+                               if (!test_OpenPrinter(tctx, p, name, ctx->environment, true)) {
+                                       ret = false;
+                               }
+                               if (!test_OpenPrinter(tctx, p, full_name, ctx->environment, true)) {
+                                       ret = false;
+                               }
+                               if (!test_OpenPrinter(tctx, p, name, ctx->environment, false)) {
                                        ret = false;
                                }
-                               if (!test_OpenPrinterEx(tctx, p, name, environment)) {
+                               if (!test_existing_printer_openprinterex(tctx, p, name, ctx->environment)) {
                                        ret = false;
                                }
                        }
@@ -4725,151 +6214,361 @@ static bool test_EnumPrinters_old(struct torture_context *tctx,
        return ret;
 }
 
-static bool test_GetPrinterDriver(struct torture_context *tctx,
-                                 struct dcerpc_binding_handle *b,
-                                 struct policy_handle *handle,
-                                 const char *driver_name)
+static bool test_EnumPrinters_level(struct torture_context *tctx,
+                                   struct dcerpc_binding_handle *b,
+                                   uint32_t flags,
+                                   const char *servername,
+                                   uint32_t level,
+                                   uint32_t *count_p,
+                                   union spoolss_PrinterInfo **info_p)
 {
-       struct spoolss_GetPrinterDriver r;
+       struct spoolss_EnumPrinters r;
+       union spoolss_PrinterInfo *info;
        uint32_t needed;
+       uint32_t count;
 
-       r.in.handle = handle;
-       r.in.architecture = "W32X86";
-       r.in.level = 1;
-       r.in.buffer = NULL;
-       r.in.offered = 0;
-       r.out.needed = &needed;
+       r.in.flags      = flags;
+       r.in.server     = 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 GetPrinterDriver level %d\n", r.in.level);
+       torture_comment(tctx, "Testing EnumPrinters(%s) level %u\n",
+               r.in.server, r.in.level);
 
-       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver_r(b, tctx, &r),
-               "failed to call GetPrinterDriver");
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_EnumPrinters_r(b, tctx, &r),
+               "EnumPrinters failed");
        if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                r.in.buffer = &blob;
                r.in.offered = needed;
-               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver_r(b, tctx, &r),
-                       "failed to call GetPrinterDriver");
+               torture_assert_ntstatus_ok(tctx,
+                       dcerpc_spoolss_EnumPrinters_r(b, tctx, &r),
+                       "EnumPrinters failed");
        }
 
-       torture_assert_werr_ok(tctx, r.out.result,
-               "failed to call GetPrinterDriver");
+       torture_assert_werr_ok(tctx, r.out.result, "EnumPrinters failed");
 
-       CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+       CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinters, info, r.in.level, count, needed, 4);
+
+       if (count_p) {
+               *count_p = count;
+       }
+       if (info_p) {
+               *info_p = info;
+       }
 
        return true;
 }
 
-static bool test_GetPrinterDriver2(struct torture_context *tctx,
-                                  struct dcerpc_binding_handle *b,
-                                  struct policy_handle *handle,
-                                  const char *driver_name,
-                                  const char *architecture)
+static const char *get_short_printername(struct torture_context *tctx,
+                                        const char *name)
+{
+       const char *short_name;
+
+       if (name[0] == '\\' && name[1] == '\\') {
+               name += 2;
+               short_name = strchr(name, '\\');
+               if (short_name) {
+                       return talloc_strdup(tctx, short_name+1);
+               }
+       }
+
+       return name;
+}
+
+static const char *get_full_printername(struct torture_context *tctx,
+                                       const char *name)
+{
+       const char *full_name = talloc_strdup(tctx, name);
+       char *p;
+
+       if (name && name[0] == '\\' && name[1] == '\\') {
+               name += 2;
+               p = strchr(name, '\\');
+               if (p) {
+                       return full_name;
+               }
+       }
+
+       return NULL;
+}
+
+static bool test_OnePrinter_servername(struct torture_context *tctx,
+                                      struct dcerpc_pipe *p,
+                                      struct dcerpc_binding_handle *b,
+                                      const char *servername,
+                                      const char *printername)
+{
+       union spoolss_PrinterInfo info;
+       const char *short_name = get_short_printername(tctx, printername);
+       const char *full_name = get_full_printername(tctx, printername);
+
+       if (short_name) {
+               struct policy_handle handle;
+               torture_assert(tctx,
+                       call_OpenPrinterEx(tctx, p, short_name, NULL, &handle),
+                       "failed to open printer");
+
+               torture_assert(tctx,
+                       test_GetPrinter_level(tctx, b, &handle, 2, &info),
+                       "failed to get printer info");
+
+               torture_assert_casestr_equal(tctx, info.info2.servername, NULL,
+                       "unexpected servername");
+               torture_assert_casestr_equal(tctx, info.info2.printername, short_name,
+                       "unexpected printername");
+
+               if (info.info2.devmode) {
+                       const char *expected_devicename;
+                       expected_devicename = talloc_strndup(tctx, short_name, MIN(strlen(short_name), 31));
+                       torture_assert_casestr_equal(tctx, info.info2.devmode->devicename, expected_devicename,
+                               "unexpected devicemode devicename");
+               }
+
+               torture_assert(tctx,
+                       test_ClosePrinter(tctx, b, &handle),
+                       "failed to close printer");
+       }
+
+       if (full_name) {
+               struct policy_handle handle;
+
+               torture_assert(tctx,
+                       call_OpenPrinterEx(tctx, p, full_name, NULL, &handle),
+                       "failed to open printer");
+
+               torture_assert(tctx,
+                       test_GetPrinter_level(tctx, b, &handle, 2, &info),
+                       "failed to get printer info");
+
+               torture_assert_casestr_equal(tctx, info.info2.servername, servername,
+                       "unexpected servername");
+               torture_assert_casestr_equal(tctx, info.info2.printername, full_name,
+                       "unexpected printername");
+
+               if (info.info2.devmode) {
+                       const char *expected_devicename;
+                       expected_devicename = talloc_strndup(tctx, full_name, MIN(strlen(full_name), 31));
+                       torture_assert_casestr_equal(tctx, info.info2.devmode->devicename, expected_devicename,
+                               "unexpected devicemode devicename");
+               }
+
+               torture_assert(tctx,
+                       test_ClosePrinter(tctx, b, &handle),
+                       "failed to close printer");
+       }
+
+       return true;
+}
+
+static bool test_EnumPrinters_servername(struct torture_context *tctx,
+                                        void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       int i;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       uint32_t count;
+       union spoolss_PrinterInfo *info;
+       const char *servername;
+       uint32_t flags = PRINTER_ENUM_NAME|PRINTER_ENUM_LOCAL;
+
+       torture_comment(tctx, "Testing servername behaviour in EnumPrinters and GetPrinters\n");
+
+       servername = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+
+       torture_assert(tctx,
+               test_EnumPrinters_level(tctx, b, flags, servername, 2, &count, &info),
+               "failed to enumerate printers");
+
+       for (i=0; i < count; i++) {
+
+               torture_assert_casestr_equal(tctx, info[i].info2.servername, servername,
+                       "unexpected servername");
+
+               torture_assert(tctx,
+                       test_OnePrinter_servername(tctx, p, b, servername, info[i].info2.printername),
+                       "failed to check printer");
+       }
+
+       servername = "";
+
+       torture_assert(tctx,
+               test_EnumPrinters_level(tctx, b, flags, servername, 2, &count, &info),
+               "failed to enumerate printers");
+
+       for (i=0; i < count; i++) {
+
+               torture_assert_casestr_equal(tctx, info[i].info2.servername, NULL,
+                       "unexpected servername");
+
+               torture_assert(tctx,
+                       test_OnePrinter_servername(tctx, p, b, servername, info[i].info2.printername),
+                       "failed to check printer");
+       }
+
+
+       return true;
+}
+
+
+static bool test_GetPrinterDriver(struct torture_context *tctx,
+                                 struct dcerpc_binding_handle *b,
+                                 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_r(b, tctx, &r),
+               "failed to call GetPrinterDriver");
+       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver_r(b, tctx, &r),
+                       "failed to call GetPrinterDriver");
+       }
+
+       torture_assert_werr_ok(tctx, r.out.result,
+               "failed to call GetPrinterDriver");
+
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, needed, 4);
+
+       return true;
+}
+
+static bool test_GetPrinterDriver2_level(struct torture_context *tctx,
+                                        struct dcerpc_binding_handle *b,
+                                        struct policy_handle *handle,
+                                        const char *driver_name,
+                                        const char *architecture,
+                                        uint32_t level,
+                                        uint32_t client_major_version,
+                                        uint32_t client_minor_version,
+                                        union spoolss_DriverInfo *info_p,
+                                        WERROR *result_p)
+
 {
        struct spoolss_GetPrinterDriver2 r;
-       uint16_t levels[] = {1, 2, 3, 4, 5, 6, 8, 101 };
        uint32_t needed;
        uint32_t server_major_version;
        uint32_t server_minor_version;
-       int i;
 
        r.in.handle = handle;
        r.in.architecture = architecture;
-       r.in.client_major_version = 3;
-       r.in.client_minor_version = 0;
+       r.in.client_major_version = client_major_version;
+       r.in.client_minor_version = client_minor_version;
+       r.in.buffer = NULL;
+       r.in.offered = 0;
+       r.in.level = level;
        r.out.needed = &needed;
        r.out.server_major_version = &server_major_version;
        r.out.server_minor_version = &server_minor_version;
 
-       for (i=0;i<ARRAY_SIZE(levels);i++) {
+       torture_comment(tctx, "Testing GetPrinterDriver2(%s) level %d\n",
+               driver_name, r.in.level);
 
-               r.in.buffer = NULL;
-               r.in.offered = 0;
-               r.in.level = levels[i];
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_GetPrinterDriver2_r(b, tctx, &r),
+               "failed to call GetPrinterDriver2");
+       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+               torture_assert_ntstatus_ok(tctx,
+                       dcerpc_spoolss_GetPrinterDriver2_r(b, tctx, &r),
+                       "failed to call GetPrinterDriver2");
+       }
 
-               torture_comment(tctx, "Testing GetPrinterDriver2(%s) level %d\n",
-                       driver_name, r.in.level);
+       if (result_p) {
+               *result_p = r.out.result;
+       }
 
-               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2_r(b, tctx, &r),
-                       "failed to call GetPrinterDriver2");
-               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_GetPrinterDriver2_r(b, tctx, &r),
-                               "failed to call GetPrinterDriver2");
+       if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_LEVEL)) {
+               switch (r.in.level) {
+               case 101:
+               case 8:
+                       torture_comment(tctx,
+                               "level %d not implemented, not considering as an error\n",
+                               r.in.level);
+                       return true;
+               default:
+                       break;
                }
+       }
 
-               if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_LEVEL)) {
-                       switch (r.in.level) {
-                       case 101:
-                       case 8:
-                               continue;
-                       default:
-                               break;
-                       }
-               }
+       torture_assert_werr_ok(tctx, r.out.result,
+               "failed to call GetPrinterDriver2");
 
-               torture_assert_werr_ok(tctx, r.out.result,
-                       "failed to call GetPrinterDriver2");
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, needed, 4);
+
+       if (info_p) {
+               *info_p = *r.out.info;
+       }
+
+       return true;
+}
+
+static bool test_GetPrinterDriver2(struct torture_context *tctx,
+                                  struct dcerpc_binding_handle *b,
+                                  struct policy_handle *handle,
+                                  const char *driver_name,
+                                  const char *architecture)
+{
+       uint16_t levels[] = {1, 2, 3, 4, 5, 6, 8, 101 };
+       int i;
+
+
+       for (i=0;i<ARRAY_SIZE(levels);i++) {
 
-               CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+               torture_assert(tctx,
+                       test_GetPrinterDriver2_level(tctx, b, handle, driver_name, architecture, levels[i], 3, 0, NULL, NULL),
+                       "");
        }
 
        return true;
 }
 
 static bool test_EnumPrinterDrivers_old(struct torture_context *tctx,
-                                       struct dcerpc_pipe *p,
-                                       const char *environment)
+                                       void *private_data)
 {
-       struct spoolss_EnumPrinterDrivers r;
-       NTSTATUS status;
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
        uint16_t levels[] = {1, 2, 3, 4, 5, 6};
        int i;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
        struct dcerpc_binding_handle *b = p->binding_handle;
+       const char *server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 
        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 = environment;
-               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);
-
-               status = dcerpc_spoolss_EnumPrinterDrivers_r(b, tctx, &r);
-
-               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, needed);
-                       data_blob_clear(&blob);
-                       r.in.buffer = &blob;
-                       r.in.offered = needed;
-                       status = dcerpc_spoolss_EnumPrinterDrivers_r(b, tctx, &r);
-               }
-
-               torture_assert_ntstatus_ok(tctx, status, "EnumPrinterDrivers failed");
-
-               torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDrivers failed");
+               torture_assert(tctx,
+                       test_EnumPrinterDrivers_args(tctx, b, server_name, ctx->environment, levels[i], &count, &info),
+                       "failed to enumerate drivers");
 
                if (!info) {
                        torture_comment(tctx, "No printer drivers returned\n");
                        break;
                }
-
-               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinterDrivers, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
        }
 
        return true;
@@ -4921,8 +6620,7 @@ static bool test_EnumPrinters_findname(struct torture_context *tctx,
                "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);
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
                e.in.buffer = &blob;
                e.in.offered = needed;
 
@@ -4988,7 +6686,8 @@ static bool test_AddPrinter_wellknown(struct torture_context *tctx,
        ZERO_STRUCT(userlevel_ctr);
        ZERO_STRUCT(info1);
 
-       torture_comment(tctx, "Testing AddPrinter%s level 1\n", ex ? "Ex":"");
+       torture_comment(tctx, "Testing AddPrinter%s(%s) level 1\n",
+                       ex ? "Ex":"", printername);
 
        /* try to add printer to wellknown printer list (level 1) */
 
@@ -5051,589 +6750,2307 @@ static bool test_AddPrinter_wellknown(struct torture_context *tctx,
           better do a real check to see the printer has really been removed
           from the well known printer list */
 
-       found = false;
+       found = false;
+
+       torture_assert(tctx, test_EnumPrinters_findname(tctx, b,
+                                                       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,
+                                  struct spoolss_DeviceMode *devmode,
+                                  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;
+       bool existing_printer_deleted = false;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+       ZERO_STRUCT(userlevel_ctr);
+
+       torture_comment(tctx, "Testing AddPrinter%s(%s) level 2\n",
+                       ex ? "Ex":"", printername);
+
+       devmode_ctr.devmode = devmode;
+
+       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_r(b, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter_r(b, 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_r(b, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter_r(b, 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;
+
+               if (existing_printer_deleted) {
+                       torture_fail(tctx, "already deleted printer still existing?");
+               }
+
+               torture_assert(tctx, call_OpenPrinterEx(tctx, p, printername, NULL, &printer_handle),
+                       "failed to open printer handle");
+
+               torture_assert(tctx, test_DeletePrinter(tctx, b, &printer_handle),
+                       "failed to delete printer");
+
+               torture_assert(tctx, test_ClosePrinter(tctx, b, &printer_handle),
+                       "failed to close server handle");
+
+               existing_printer_deleted = true;
+
+               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_r(b, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter_r(b, 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_r(b, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter_r(b, tctx, &r),
+               "failed to add printer");
+       result = ex ? rex.out.result : r.out.result;
+
+       /* w2k8r2 allows to add printer w/o defining printprocessor */
+
+       if (!W_ERROR_IS_OK(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_r(b, tctx, &rex) :
+                                                     dcerpc_spoolss_AddPrinter_r(b, 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, b,
+                                                       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_r(b, tctx, &rex) :
+                                             dcerpc_spoolss_AddPrinter_r(b, 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_printer_info(struct torture_context *tctx,
+                             void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       bool ret = true;
+
+       if (torture_setting_bool(tctx, "samba3", false)) {
+               torture_skip(tctx, "skipping printer info cross tests against samba 3");
+       }
+
+       if (!test_PrinterInfo(tctx, b, &t->handle)) {
+               ret = false;
+       }
+
+       if (!test_SetPrinter_errors(tctx, b, &t->handle)) {
+               ret = false;
+       }
+
+       return ret;
+}
+
+static bool test_EnumPrinterKey(struct torture_context *tctx,
+                               struct dcerpc_binding_handle *b,
+                               struct policy_handle *handle,
+                               const char *key_name,
+                               const char ***array)
+{
+       struct spoolss_EnumPrinterKey r;
+       uint32_t needed = 0;
+       union spoolss_KeyNames key_buffer;
+       int32_t offered[] = { 0, 1, 2, 3, 4, 5, -1, -2, -3, -4, -5, 256, 512, 1024, 2048 };
+       uint32_t _ndr_size;
+       int i;
+
+       r.in.handle = handle;
+       r.in.key_name = key_name;
+       r.out.key_buffer = &key_buffer;
+       r.out.needed = &needed;
+       r.out._ndr_size = &_ndr_size;
+
+       for (i=0; i < ARRAY_SIZE(offered); i++) {
+
+               if (offered[i] < 0 && needed) {
+                       if (needed <= 4) {
+                               continue;
+                       }
+                       r.in.offered = needed + offered[i];
+               } else {
+                       r.in.offered = offered[i];
+               }
+
+               ZERO_STRUCT(key_buffer);
+
+               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_r(b, tctx, &r),
+                       "failed to call EnumPrinterKey");
+               if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
+
+                       torture_assert(tctx, (_ndr_size == r.in.offered/2),
+                               talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
+                                       _ndr_size, r.in.offered/2));
+
+                       r.in.offered = needed;
+                       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey_r(b, tctx, &r),
+                               "failed to call EnumPrinterKey");
+               }
+
+               if (offered[i] > 0) {
+                       torture_assert_werr_ok(tctx, r.out.result,
+                               "failed to call EnumPrinterKey");
+               }
+
+               torture_assert(tctx, (_ndr_size == r.in.offered/2),
+                       talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
+                               _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 <= _ndr_size * 2),
+                       talloc_asprintf(tctx, "EnumPrinterKey size mismatch: needed %d is not <= _ndr_size %d * 2", *r.out.needed, _ndr_size));
+
+               if (key_buffer.string_array) {
+                       uint32_t calc_needed = 0;
+                       int s;
+                       for (s=0; key_buffer.string_array[s]; s++) {
+                               calc_needed += strlen_m_term(key_buffer.string_array[s])*2;
+                       }
+                       if (!key_buffer.string_array[0]) {
+                               calc_needed += 2;
+                       }
+                       calc_needed += 2;
+
+                       torture_assert_int_equal(tctx, *r.out.needed, calc_needed,
+                               "EnumPrinterKey unexpected size");
+               }
+       }
+
+       if (array) {
+               *array = key_buffer.string_array;
+       }
+
+       return true;
+}
+
+bool test_printer_all_keys(struct torture_context *tctx,
+                          struct dcerpc_binding_handle *b,
+                          struct policy_handle *handle)
+{
+       const char **key_array = NULL;
+       int i;
+
+       torture_comment(tctx, "Testing Printer Keys\n");
+
+       torture_assert(tctx, test_EnumPrinterKey(tctx, b, handle, "", &key_array),
+               "failed to call test_EnumPrinterKey");
+
+       for (i=0; key_array && key_array[i]; i++) {
+               torture_assert(tctx, test_EnumPrinterKey(tctx, b, 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, b, handle, key_array[i], NULL, NULL),
+                       "failed to call test_EnumPrinterDataEx");
+       }
+
+       torture_comment(tctx, "Printer Keys test succeeded\n\n");
+
+       return true;
+}
+
+static bool test_openprinter_wrap(struct torture_context *tctx,
+                                 void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       const char *printername = t->info2.printername;
+
+       return test_openprinter(tctx, b, printername);
+}
+
+static bool test_csetprinter(struct torture_context *tctx,
+                            void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       const char *printername = talloc_asprintf(tctx, "%s2", t->info2.printername);
+       const char *drivername = t->added_driver ? t->driver.info8.driver_name : t->info2.drivername;
+       const char *portname = t->info2.portname;
+
+       union spoolss_PrinterInfo info;
+       struct policy_handle new_handle, new_handle2;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       torture_comment(tctx, "Testing c_setprinter\n");
+
+       torture_assert(tctx,
+               test_GetPrinter_level(tctx, b, &t->handle, 0, &info),
+               "failed to get level 0 printer info");
+       torture_comment(tctx, "csetprinter on initial printer handle: %d\n",
+               info.info0.c_setprinter);
+
+       /* check if c_setprinter on 1st handle increases after a printer has
+        * been added */
+
+       torture_assert(tctx,
+               test_AddPrinter_normal(tctx, p, &new_handle, printername, drivername, portname, NULL, false),
+               "failed to add new printer");
+       torture_assert(tctx,
+               test_GetPrinter_level(tctx, b, &t->handle, 0, &info),
+               "failed to get level 0 printer info");
+       torture_comment(tctx, "csetprinter on initial printer handle (after add): %d\n",
+               info.info0.c_setprinter);
+
+       /* check if c_setprinter on new handle increases after a printer has
+        * been added */
+
+       torture_assert(tctx,
+               test_GetPrinter_level(tctx, b, &new_handle, 0, &info),
+               "failed to get level 0 printer info");
+       torture_comment(tctx, "csetprinter on created handle: %d\n",
+               info.info0.c_setprinter);
+
+       /* open the new printer and check if c_setprinter increases */
+
+       torture_assert(tctx,
+               call_OpenPrinterEx(tctx, p, printername, NULL, &new_handle2),
+               "failed to open created printer");
+       torture_assert(tctx,
+               test_GetPrinter_level(tctx, b, &new_handle2, 0, &info),
+               "failed to get level 0 printer info");
+       torture_comment(tctx, "csetprinter on new handle (after openprinter): %d\n",
+               info.info0.c_setprinter);
+
+       /* cleanup */
+
+       torture_assert(tctx,
+               test_ClosePrinter(tctx, b, &new_handle2),
+               "failed to close printer");
+       torture_assert(tctx,
+               test_DeletePrinter(tctx, b, &new_handle),
+               "failed to delete new printer");
+
+       return true;
+}
+
+static bool compose_local_driver_directory(struct torture_context *tctx,
+                                          const char *environment,
+                                          const char *local_dir,
+                                          const char **path)
+{
+       char *p;
+
+       p = strrchr(local_dir, '/');
+       if (!p) {
+               return NULL;
+       }
+       p++;
+
+       if (strequal(environment, "Windows x64")) {
+               if (!strequal(p, "x64")) {
+                       *path = talloc_asprintf(tctx, "%s/x64", local_dir);
+               }
+       } else if (strequal(environment, "Windows NT x86")) {
+               if (!strequal(p, "i386")) {
+                       *path = talloc_asprintf(tctx, "%s/i386", local_dir);
+               }
+       } else {
+               torture_assert(tctx, "unknown environment: '%s'\n", environment);
+       }
+
+       return true;
+}
+
+static struct spoolss_DeviceMode *torture_devicemode(TALLOC_CTX *mem_ctx,
+                                                    const char *devicename)
+{
+       struct spoolss_DeviceMode *r;
+
+       r = talloc_zero(mem_ctx, struct spoolss_DeviceMode);
+       if (r == NULL) {
+               return NULL;
+       }
+
+       r->devicename           = talloc_strdup(r, devicename);
+       r->specversion          = DMSPEC_NT4_AND_ABOVE;
+       r->driverversion        = 0x0600;
+       r->size                 = 0x00dc;
+       r->__driverextra_length = 0;
+       r->fields               = DEVMODE_FORMNAME |
+                                 DEVMODE_TTOPTION |
+                                 DEVMODE_PRINTQUALITY |
+                                 DEVMODE_DEFAULTSOURCE |
+                                 DEVMODE_COPIES |
+                                 DEVMODE_SCALE |
+                                 DEVMODE_PAPERSIZE |
+                                 DEVMODE_ORIENTATION;
+       r->orientation          = DMORIENT_PORTRAIT;
+       r->papersize            = DMPAPER_LETTER;
+       r->paperlength          = 0;
+       r->paperwidth           = 0;
+       r->scale                = 100;
+       r->copies               = 55;
+       r->defaultsource        = DMBIN_FORMSOURCE;
+       r->printquality         = DMRES_HIGH;
+       r->color                = DMRES_MONOCHROME;
+       r->duplex               = DMDUP_SIMPLEX;
+       r->yresolution          = 0;
+       r->ttoption             = DMTT_SUBDEV;
+       r->collate              = DMCOLLATE_FALSE;
+       r->formname             = talloc_strdup(r, "Letter");
+
+       return r;
+}
+
+static bool test_architecture_buffer(struct torture_context *tctx,
+                                    void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+
+       struct spoolss_OpenPrinterEx r;
+       struct spoolss_UserLevel1 u1;
+       struct policy_handle handle;
+       uint32_t architectures[] = {
+               PROCESSOR_ARCHITECTURE_INTEL,
+               PROCESSOR_ARCHITECTURE_IA64,
+               PROCESSOR_ARCHITECTURE_AMD64
+       };
+       uint32_t needed[3];
+       int i;
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       for (i=0; i < ARRAY_SIZE(architectures); i++) {
+
+               torture_comment(tctx, "Testing OpenPrinterEx with architecture %d\n", architectures[i]);
+
+               u1.size = 0;
+               u1.client = NULL;
+               u1.user = NULL;
+               u1.build = 0;
+               u1.major = 3;
+               u1.minor = 0;
+               u1.processor = architectures[i];
+
+               r.in.printername        = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+               r.in.datatype           = NULL;
+               r.in.devmode_ctr.devmode= NULL;
+               r.in.access_mask        = SEC_FLAG_MAXIMUM_ALLOWED;
+               r.in.level               = 1;
+               r.in.userlevel.level1   = &u1;
+               r.out.handle            = &handle;
+
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_OpenPrinterEx_r(b, tctx, &r), "");
+               torture_assert_werr_ok(tctx, r.out.result, "");
+
+               {
+                       struct spoolss_EnumPrinters e;
+                       uint32_t count;
+                       union spoolss_PrinterInfo *info;
+
+                       e.in.flags = PRINTER_ENUM_LOCAL;
+                       e.in.server = NULL;
+                       e.in.level = 2;
+                       e.in.buffer = NULL;
+                       e.in.offered = 0;
+                       e.out.count = &count;
+                       e.out.info = &info;
+                       e.out.needed = &needed[i];
+
+                       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinters_r(b, tctx, &e), "");
+#if 0
+                       torture_comment(tctx, "needed was %d\n", needed[i]);
+#endif
+               }
+
+               torture_assert(tctx, test_ClosePrinter(tctx, b, &handle), "");
+       }
+
+       for (i=1; i < ARRAY_SIZE(architectures); i++) {
+               if (needed[i-1] != needed[i]) {
+                       torture_fail(tctx,
+                               talloc_asprintf(tctx, "needed size %d for architecture %d != needed size %d for architecture %d\n",
+                                               needed[i-1], architectures[i-1], needed[i], architectures[i]));
+               }
+       }
+
+       return true;
+}
+
+static bool test_PrintServer_Forms_Winreg(struct torture_context *tctx,
+                                         void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       return test_Forms_winreg(tctx, b, &ctx->server_handle, true, NULL);
+}
+
+static bool test_PrintServer_Forms(struct torture_context *tctx,
+                                  void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       return test_Forms(tctx, b, &ctx->server_handle, true, NULL, NULL, NULL);
+}
+
+static bool test_PrintServer_EnumForms(struct torture_context *tctx,
+                                      void *private_data)
+{
+       struct test_spoolss_context *ctx =
+               talloc_get_type_abort(private_data, struct test_spoolss_context);
+       struct dcerpc_pipe *p = ctx->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       return test_EnumForms_all(tctx, b, &ctx->server_handle, true);
+}
+
+static bool torture_rpc_spoolss_setup_common(struct torture_context *tctx, struct test_spoolss_context *t)
+{
+       NTSTATUS status;
+
+       status = torture_rpc_connection(tctx, &t->spoolss_pipe, &ndr_table_spoolss);
+
+       torture_assert_ntstatus_ok(tctx, status, "Error connecting to server");
+
+       torture_assert(tctx,
+               test_OpenPrinter_server(tctx, t->spoolss_pipe, &t->server_handle),
+               "failed to open printserver");
+       torture_assert(tctx,
+               test_get_environment(tctx, t->spoolss_pipe->binding_handle, &t->server_handle, &t->environment),
+               "failed to get environment");
+
+       return true;
+}
+
+static bool torture_rpc_spoolss_setup(struct torture_context *tctx, void **data)
+{
+       struct test_spoolss_context *t;
+
+       *data = t = talloc_zero(tctx, struct test_spoolss_context);
+
+       return torture_rpc_spoolss_setup_common(tctx, t);
+}
+
+static bool torture_rpc_spoolss_teardown_common(struct torture_context *tctx, struct test_spoolss_context *t)
+{
+       test_ClosePrinter(tctx, t->spoolss_pipe->binding_handle, &t->server_handle);
+
+       return true;
+}
+
+static bool torture_rpc_spoolss_teardown(struct torture_context *tctx, void *data)
+{
+       struct test_spoolss_context *t = talloc_get_type(data, struct test_spoolss_context);
+       bool ret;
+
+       ret = torture_rpc_spoolss_teardown_common(tctx, t);
+       talloc_free(t);
+
+       return ret;
+}
+
+static bool torture_rpc_spoolss_printer_setup_common(struct torture_context *tctx, struct torture_printer_context *t)
+{
+       struct dcerpc_pipe *p;
+       struct dcerpc_binding_handle *b;
+       const char *server_name_slash;
+       const char *driver_name;
+       const char *printer_name;
+       const char *port_name;
+
+       torture_assert_ntstatus_ok(tctx,
+               torture_rpc_connection(tctx, &t->spoolss_pipe, &ndr_table_spoolss),
+               "Error connecting to server");
+
+       p = t->spoolss_pipe;
+       b = p->binding_handle;
+       server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+
+       t->driver.info8.version                 = SPOOLSS_DRIVER_VERSION_200X;
+       t->driver.info8.driver_name             = TORTURE_DRIVER;
+       t->driver.info8.driver_path             = "pscript5.dll";
+       t->driver.info8.data_file               = "cups6.ppd";
+       t->driver.info8.config_file             = "ps5ui.dll";
+       t->driver.info8.help_file               = "pscript.hlp";
+       t->driver.info8.default_datatype        = "RAW";
+       t->driver.info8.dependent_files         = talloc_zero(t, struct spoolss_StringArray);
+       t->driver.info8.dependent_files->string = talloc_zero_array(t, const char *, 8 + 1);
+       t->driver.info8.dependent_files->string[0] = "pscript5.dll";
+       t->driver.info8.dependent_files->string[1] = "cups6.ppd";
+       t->driver.info8.dependent_files->string[2] = "ps5ui.dll";
+       t->driver.info8.dependent_files->string[3] = "pscript.hlp";
+       t->driver.info8.dependent_files->string[4] = "pscript.ntf";
+       t->driver.info8.dependent_files->string[5] = "cups6.ini";
+       t->driver.info8.dependent_files->string[6] = "cupsps6.dll";
+       t->driver.info8.dependent_files->string[7] = "cupsui6.dll";
+
+       t->driver.local.driver_directory= "/usr/share/cups/drivers";
+
+       t->info2.drivername             = "Microsoft XPS Document Writer";
+       t->info2.portname               = "LPT1:";
+
+       printer_name = t->info2.printername;
+       port_name = t->info2.portname;
+
+       torture_assert(tctx,
+               fillup_printserver_info(tctx, p, &t->driver),
+               "failed to fillup printserver info");
+
+       t->driver.info8.architecture = talloc_strdup(t, t->driver.remote.environment);
+
+       torture_assert(tctx,
+               compose_local_driver_directory(tctx, t->driver.remote.environment,
+                                              t->driver.local.driver_directory,
+                                              &t->driver.local.driver_directory),
+               "failed to compose local driver directory");
+
+       if (test_EnumPrinterDrivers_findone(tctx, b, server_name_slash, t->driver.remote.environment, 3, t->info2.drivername)) {
+               torture_comment(tctx, "driver '%s' (architecture: %s, version: 3) is present on server\n",
+                       t->info2.drivername, t->driver.remote.environment);
+               t->have_driver = true;
+               goto try_add;
+       }
+
+       torture_comment(tctx, "driver '%s' (architecture: %s, version: 3) does not exist on the server\n",
+               t->info2.drivername, t->driver.remote.environment);
+       torture_comment(tctx, "trying to upload own driver\n");
+
+       if (!directory_exist(t->driver.local.driver_directory)) {
+               torture_warning(tctx, "no local driver is available!");
+               t->have_driver = false;
+               goto try_add;
+       }
+
+       torture_assert(tctx,
+               upload_printer_driver(tctx, dcerpc_server_name(p), &t->driver),
+               "failed to upload printer driver");
+
+       torture_assert(tctx,
+               test_AddPrinterDriver_args_level_3(tctx, b, server_name_slash, &t->driver.info8, 0, false),
+               "failed to add driver");
+
+       t->added_driver = true;
+       t->have_driver = true;
+
+ try_add:
+       driver_name = t->added_driver ? t->driver.info8.driver_name : t->info2.drivername;
+
+       if (t->wellknown) {
+               torture_assert(tctx,
+                       test_AddPrinter_wellknown(tctx, p, printer_name, t->ex),
+                       "failed to add wellknown printer");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinter_normal(tctx, p, &t->handle, printer_name, driver_name, port_name, t->devmode, t->ex),
+                       "failed to add printer");
+       }
+
+       return true;
+}
+
+static bool torture_rpc_spoolss_printer_setup(struct torture_context *tctx, void **data)
+{
+       struct torture_printer_context *t;
+
+       *data = t = talloc_zero(tctx, struct torture_printer_context);
+
+       t->ex                   = false;
+       t->wellknown            = false;
+       t->info2.printername    = TORTURE_PRINTER;
+       t->devmode              = NULL;
+
+       return torture_rpc_spoolss_printer_setup_common(tctx, t);
+}
+
+static bool torture_rpc_spoolss_printerex_setup(struct torture_context *tctx, void **data)
+{
+       struct torture_printer_context *t;
+
+       *data = t = talloc_zero(tctx, struct torture_printer_context);
+
+       t->ex                   = true;
+       t->wellknown            = false;
+       t->info2.printername    = TORTURE_PRINTER_EX;
+       t->devmode              = NULL;
+
+       return torture_rpc_spoolss_printer_setup_common(tctx, t);
+}
+
+static bool torture_rpc_spoolss_printerwkn_setup(struct torture_context *tctx, void **data)
+{
+       struct torture_printer_context *t;
+
+       *data = t = talloc_zero(tctx, struct torture_printer_context);
+
+       t->ex                   = false;
+       t->wellknown            = true;
+       t->info2.printername    = TORTURE_WELLKNOWN_PRINTER;
+       t->devmode              = NULL;
+
+       if (t->wellknown && torture_setting_bool(tctx, "samba3", false)) {
+               torture_skip(tctx, "skipping AddPrinter level 1 against samba");
+       }
+
+       return torture_rpc_spoolss_printer_setup_common(tctx, t);
+}
+
+static bool torture_rpc_spoolss_printerexwkn_setup(struct torture_context *tctx, void **data)
+{
+       struct torture_printer_context *t;
+
+       *data = t = talloc_zero(tctx, struct torture_printer_context);
+
+       t->ex                   = true;
+       t->wellknown            = true;
+       t->info2.printername    = TORTURE_WELLKNOWN_PRINTER_EX;
+       t->devmode              = NULL;
+
+       if (t->wellknown && torture_setting_bool(tctx, "samba3", false)) {
+               torture_skip(tctx, "skipping AddPrinter level 1 against samba");
+       }
+
+       return torture_rpc_spoolss_printer_setup_common(tctx, t);
+}
+
+static bool torture_rpc_spoolss_printerdm_setup(struct torture_context *tctx, void **data)
+{
+       struct torture_printer_context *t;
+
+       *data = t = talloc_zero(tctx, struct torture_printer_context);
+
+       t->ex                   = true;
+       t->wellknown            = false;
+       t->info2.printername    = TORTURE_PRINTER_EX;
+       t->devmode              = torture_devicemode(t, TORTURE_PRINTER_EX);
+
+       return torture_rpc_spoolss_printer_setup_common(tctx, t);
+}
+
+static bool torture_rpc_spoolss_printer_teardown_common(struct torture_context *tctx, struct torture_printer_context *t)
+{
+       bool found = false;
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       struct dcerpc_binding_handle *b;
+       const char *printer_name = t->info2.printername;
+
+       if (t->added_driver) {
+               torture_assert(tctx,
+                       remove_printer_driver(tctx, dcerpc_server_name(t->spoolss_pipe), &t->driver),
+                       "failed to remove printer driver");
+       }
+
+       if (p) {
+               b = p->binding_handle;
+       }
+
+       if (!t->wellknown) {
+               torture_assert(tctx,
+                       test_DeletePrinter(tctx, b, &t->handle),
+                       "failed to delete printer");
+
+               torture_assert(tctx,
+                       test_EnumPrinters_findname(tctx, b, PRINTER_ENUM_LOCAL, 1,
+                                                  printer_name, &found),
+                       "failed to enumerate printers");
+
+               torture_assert(tctx, !found, "deleted printer still there");
+       }
+
+       return true;
+}
+
+static bool torture_rpc_spoolss_printer_teardown(struct torture_context *tctx, void *data)
+{
+       struct torture_printer_context *t = talloc_get_type(data, struct torture_printer_context);
+       bool ret;
+
+       ret = torture_rpc_spoolss_printer_teardown_common(tctx, t);
+       talloc_free(t);
+
+       return ret;
+}
+
+static bool test_print_test(struct torture_context *tctx,
+                           void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       torture_assert(tctx,
+               test_PausePrinter(tctx, b, &t->handle),
+               "failed to pause printer");
+
+       torture_assert(tctx,
+               test_DoPrintTest(tctx, b, &t->handle),
+               "failed to do print test");
+
+       torture_assert(tctx,
+               test_ResumePrinter(tctx, b, &t->handle),
+               "failed to resume printer");
+
+       return true;
+}
+
+static bool test_print_test_extended(struct torture_context *tctx,
+                                    void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       bool ret = true;
+
+       torture_assert(tctx,
+               test_PausePrinter(tctx, b, &t->handle),
+               "failed to pause printer");
+
+       ret = test_DoPrintTest_extended(tctx, b, &t->handle);
+       if (ret == false) {
+               torture_comment(tctx, "WARNING! failed to do extended print test\n");
+               if (torture_setting_bool(tctx, "samba3", false)) {
+                       torture_comment(tctx, "non-critical for samba3\n");
+                       ret = true;
+                       tctx->last_result = TORTURE_SKIP;
+               }
+       }
+
+       torture_assert(tctx,
+               test_ResumePrinter(tctx, b, &t->handle),
+               "failed to resume printer");
+
+       return ret;
+}
+
+static bool test_printer_sd(struct torture_context *tctx,
+                           void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       torture_assert(tctx,
+               test_PrinterInfo_SD(tctx, b, &t->handle),
+               "failed to test security descriptors");
+
+       return true;
+}
+
+static bool test_printer_dm(struct torture_context *tctx,
+                           void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_PrinterInfo_DevMode(tctx, p, &t->handle, t->info2.printername, t->devmode),
+               "failed to test devicemodes");
+
+       return true;
+}
+
+static bool test_printer_info_winreg(struct torture_context *tctx,
+                                    void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_PrinterInfo_winreg(tctx, p, &t->handle, t->info2.printername),
+               "failed to test printer info winreg");
+
+       return true;
+}
+
+static bool test_printer_change_id(struct torture_context *tctx,
+                                  void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_ChangeID(tctx, p, &t->handle),
+               "failed to test change id");
+
+       return true;
+}
+
+static bool test_printer_keys(struct torture_context *tctx,
+                             void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+
+       torture_assert(tctx,
+               test_printer_all_keys(tctx, b, &t->handle),
+               "failed to test printer keys");
+
+       return true;
+}
+
+static bool test_printer_data_consistency(struct torture_context *tctx,
+                                         void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_EnumPrinterData_consistency(tctx, p, &t->handle),
+               "failed to test printer data consistency");
+
+       return true;
+}
+
+static bool test_printer_data_keys(struct torture_context *tctx,
+                                  void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_SetPrinterDataEx_keys(tctx, p, &t->handle),
+               "failed to test printer data keys");
+
+       return true;
+}
+
+static bool test_printer_data_values(struct torture_context *tctx,
+                                    void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_SetPrinterDataEx_values(tctx, p, &t->handle),
+               "failed to test printer data values");
+
+       return true;
+}
+
+static bool test_printer_data_set(struct torture_context *tctx,
+                                 void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_SetPrinterDataEx_matrix(tctx, p, &t->handle, t->info2.printername, NULL, NULL),
+               "failed to test printer data set");
+
+       return true;
+}
+
+static bool test_printer_data_winreg(struct torture_context *tctx,
+                                    void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_PrinterData_winreg(tctx, p, &t->handle, t->info2.printername),
+               "failed to test printer data winreg");
+
+       return true;
+}
+
+static bool test_printer_data_dsspooler(struct torture_context *tctx,
+                                       void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+
+       torture_assert(tctx,
+               test_PrinterData_DsSpooler(tctx, p, &t->handle, t->info2.printername),
+               "failed to test printer data winreg dsspooler");
+
+       return true;
+}
+
+static bool test_driver_info_winreg(struct torture_context *tctx,
+                                   void *private_data)
+{
+       struct torture_printer_context *t =
+               (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+       struct dcerpc_pipe *p = t->spoolss_pipe;
+       const char *driver_name = t->added_driver ? t->driver.info8.driver_name : t->info2.drivername;
+
+       if (!t->have_driver) {
+               torture_skip(tctx, "skipping driver info winreg test as we don't have a driver");
+       }
+
+       torture_assert(tctx,
+               test_DriverInfo_winreg(tctx, p, &t->handle, t->info2.printername, driver_name, t->driver.remote.environment),
+               "failed to test driver info winreg");
+
+       return true;
+}
+
+void torture_tcase_printer(struct torture_tcase *tcase)
+{
+       torture_tcase_add_simple_test(tcase, "openprinter", test_openprinter_wrap);
+       torture_tcase_add_simple_test(tcase, "csetprinter", test_csetprinter);
+       torture_tcase_add_simple_test(tcase, "print_test", test_print_test);
+       torture_tcase_add_simple_test(tcase, "print_test_extended", test_print_test_extended);
+       torture_tcase_add_simple_test(tcase, "printer_info", test_printer_info);
+       torture_tcase_add_simple_test(tcase, "sd", test_printer_sd);
+       torture_tcase_add_simple_test(tcase, "dm", test_printer_dm);
+       torture_tcase_add_simple_test(tcase, "printer_info_winreg", test_printer_info_winreg);
+       torture_tcase_add_simple_test(tcase, "change_id", test_printer_change_id);
+       torture_tcase_add_simple_test(tcase, "keys", test_printer_keys);
+       torture_tcase_add_simple_test(tcase, "printerdata_consistency", test_printer_data_consistency);
+       torture_tcase_add_simple_test(tcase, "printerdata_keys", test_printer_data_keys);
+       torture_tcase_add_simple_test(tcase, "printerdata_values", test_printer_data_values);
+       torture_tcase_add_simple_test(tcase, "printerdata_set", test_printer_data_set);
+       torture_tcase_add_simple_test(tcase, "printerdata_winreg", test_printer_data_winreg);
+       torture_tcase_add_simple_test(tcase, "printerdata_dsspooler", test_printer_data_dsspooler);
+       torture_tcase_add_simple_test(tcase, "driver_info_winreg", test_driver_info_winreg);
+       torture_tcase_add_simple_test(tcase, "printer_rename", test_printer_rename);
+}
+
+struct torture_suite *torture_rpc_spoolss_printer(TALLOC_CTX *mem_ctx)
+{
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "PRINTER");
+       struct torture_tcase *tcase;
+
+       tcase = torture_suite_add_tcase(suite, "addprinter");
+
+       torture_tcase_set_fixture(tcase,
+                                 torture_rpc_spoolss_printer_setup,
+                                 torture_rpc_spoolss_printer_teardown);
+
+       torture_tcase_printer(tcase);
+
+       tcase = torture_suite_add_tcase(suite, "addprinterex");
+
+       torture_tcase_set_fixture(tcase,
+                                 torture_rpc_spoolss_printerex_setup,
+                                 torture_rpc_spoolss_printer_teardown);
+
+       torture_tcase_printer(tcase);
+
+       tcase = torture_suite_add_tcase(suite, "addprinterwkn");
+
+       torture_tcase_set_fixture(tcase,
+                                 torture_rpc_spoolss_printerwkn_setup,
+                                 torture_rpc_spoolss_printer_teardown);
+
+       tcase = torture_suite_add_tcase(suite, "addprinterexwkn");
+
+       torture_tcase_set_fixture(tcase,
+                                 torture_rpc_spoolss_printerexwkn_setup,
+                                 torture_rpc_spoolss_printer_teardown);
+
+#if 0
+       /* test is not correct */
+       tcase = torture_suite_add_tcase(suite, "addprinterdm");
+
+       torture_tcase_set_fixture(tcase,
+                                 torture_rpc_spoolss_printerdm_setup,
+                                 torture_rpc_spoolss_printer_teardown);
+
+       torture_tcase_printer(tcase);
+#endif
+       return suite;
+}
+
+struct torture_suite *torture_rpc_spoolss(TALLOC_CTX *mem_ctx)
+{
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS");
+       struct torture_tcase *tcase = torture_suite_add_tcase(suite, "PRINTSERVER");
+
+       torture_tcase_set_fixture(tcase,
+                                 torture_rpc_spoolss_setup,
+                                 torture_rpc_spoolss_teardown);
+
+       torture_tcase_add_simple_test(tcase, "openprinter_badnamelist", test_OpenPrinter_badname_list);
+       torture_tcase_add_simple_test(tcase, "printer_data_list", test_GetPrinterData_list);
+       torture_tcase_add_simple_test(tcase, "enum_forms", test_PrintServer_EnumForms);
+       torture_tcase_add_simple_test(tcase, "forms", test_PrintServer_Forms);
+       torture_tcase_add_simple_test(tcase, "forms_winreg", test_PrintServer_Forms_Winreg);
+       torture_tcase_add_simple_test(tcase, "enum_ports", test_EnumPorts);
+       torture_tcase_add_simple_test(tcase, "add_port", test_AddPort);
+       torture_tcase_add_simple_test(tcase, "get_printer_driver_directory", test_GetPrinterDriverDirectory);
+       torture_tcase_add_simple_test(tcase, "get_print_processor_directory", test_GetPrintProcessorDirectory);
+       torture_tcase_add_simple_test(tcase, "enum_printer_drivers", test_EnumPrinterDrivers);
+       torture_tcase_add_simple_test(tcase, "enum_monitors", test_EnumMonitors);
+       torture_tcase_add_simple_test(tcase, "enum_print_processors", test_EnumPrintProcessors);
+       torture_tcase_add_simple_test(tcase, "print_processors_winreg", test_print_processors_winreg);
+       torture_tcase_add_simple_test(tcase, "enum_printprocdata", test_EnumPrintProcDataTypes);
+       torture_tcase_add_simple_test(tcase, "enum_printers", test_EnumPrinters);
+       torture_tcase_add_simple_test(tcase, "enum_ports_old", test_EnumPorts_old);
+       torture_tcase_add_simple_test(tcase, "enum_printers_old", test_EnumPrinters_old);
+       torture_tcase_add_simple_test(tcase, "enum_printers_servername", test_EnumPrinters_servername);
+       torture_tcase_add_simple_test(tcase, "enum_printer_drivers_old", test_EnumPrinterDrivers_old);
+       torture_tcase_add_simple_test(tcase, "architecture_buffer", test_architecture_buffer);
+
+       torture_suite_add_suite(suite, torture_rpc_spoolss_printer(suite));
+
+       return suite;
+}
+
+static bool test_GetPrinterDriverDirectory_getdir(struct torture_context *tctx,
+                                                 struct dcerpc_binding_handle *b,
+                                                 const char *server,
+                                                 const char *environment,
+                                                 const char **dir_p)
+{
+       struct spoolss_GetPrinterDriverDirectory r;
+       uint32_t needed;
+
+       r.in.server             = server;
+       r.in.environment        = environment;
+       r.in.level              = 1;
+       r.in.buffer             = NULL;
+       r.in.offered            = 0;
+       r.out.needed            = &needed;
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_GetPrinterDriverDirectory_r(b, tctx, &r),
+               "failed to query driver directory");
+
+       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+               DATA_BLOB blob = data_blob_talloc_zero(tctx, needed);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+
+               torture_assert_ntstatus_ok(tctx,
+                       dcerpc_spoolss_GetPrinterDriverDirectory_r(b, tctx, &r),
+                       "failed to query driver directory");
+       }
+
+       torture_assert_werr_ok(tctx, r.out.result,
+               "failed to query driver directory");
+
+       if (dir_p) {
+               *dir_p = r.out.info->info1.directory_name;
+       }
+
+       return true;
+}
+
+static const char *get_driver_from_info(struct spoolss_AddDriverInfoCtr *info_ctr)
+{
+       if (info_ctr == NULL) {
+               return NULL;
+       }
+
+       switch (info_ctr->level) {
+       case 1:
+               return info_ctr->info.info1->driver_name;
+       case 2:
+               return info_ctr->info.info2->driver_name;
+       case 3:
+               return info_ctr->info.info3->driver_name;
+       case 4:
+               return info_ctr->info.info4->driver_name;
+       case 6:
+               return info_ctr->info.info6->driver_name;
+       case 8:
+               return info_ctr->info.info8->driver_name;
+       default:
+               return NULL;
+       }
+}
+
+static const char *get_environment_from_info(struct spoolss_AddDriverInfoCtr *info_ctr)
+{
+       if (info_ctr == NULL) {
+               return NULL;
+       }
+
+       switch (info_ctr->level) {
+       case 2:
+               return info_ctr->info.info2->architecture;
+       case 3:
+               return info_ctr->info.info3->architecture;
+       case 4:
+               return info_ctr->info.info4->architecture;
+       case 6:
+               return info_ctr->info.info6->architecture;
+       case 8:
+               return info_ctr->info.info8->architecture;
+       default:
+               return NULL;
+       }
+}
+
+
+static bool test_AddPrinterDriver_exp(struct torture_context *tctx,
+                                     struct dcerpc_binding_handle *b,
+                                     const char *servername,
+                                     struct spoolss_AddDriverInfoCtr *info_ctr,
+                                     WERROR expected_result)
+{
+       struct spoolss_AddPrinterDriver r;
+       const char *drivername = get_driver_from_info(info_ctr);
+       const char *environment = get_environment_from_info(info_ctr);
+
+       r.in.servername = servername;
+       r.in.info_ctr = info_ctr;
+
+       torture_comment(tctx, "Testing AddPrinterDriver(%s) level: %d, environment: '%s'\n",
+               drivername, info_ctr->level, environment);
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_AddPrinterDriver_r(b, tctx, &r),
+               "spoolss_AddPrinterDriver failed");
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "spoolss_AddPrinterDriver failed with unexpected result");
+
+       return true;
+
+}
+
+static bool test_AddPrinterDriverEx_exp(struct torture_context *tctx,
+                                       struct dcerpc_binding_handle *b,
+                                       const char *servername,
+                                       struct spoolss_AddDriverInfoCtr *info_ctr,
+                                       uint32_t flags,
+                                       WERROR expected_result)
+{
+       struct spoolss_AddPrinterDriverEx r;
+       const char *drivername = get_driver_from_info(info_ctr);
+       const char *environment = get_environment_from_info(info_ctr);
+
+       r.in.servername = servername;
+       r.in.info_ctr = info_ctr;
+       r.in.flags = flags;
+
+       torture_comment(tctx, "Testing AddPrinterDriverEx(%s) level: %d, environment: '%s'\n",
+               drivername, info_ctr->level, environment);
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_AddPrinterDriverEx_r(b, tctx, &r),
+               "AddPrinterDriverEx failed");
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "AddPrinterDriverEx failed with unexpected result");
+
+       return true;
+}
+
+static bool test_AddPrinterDriver_args_level_1(struct torture_context *tctx,
+                                              struct dcerpc_binding_handle *b,
+                                              const char *server_name,
+                                              struct spoolss_AddDriverInfo8 *r,
+                                              uint32_t flags,
+                                              bool ex)
+{
+       struct spoolss_AddDriverInfoCtr info_ctr;
+       struct spoolss_AddDriverInfo1 info1;
+
+       ZERO_STRUCT(info1);
+
+       info_ctr.level = 1;
+       info_ctr.info.info1 = &info1;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_UNKNOWN_LEVEL),
+                       "failed to test AddPrinterDriverEx level 1");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_UNKNOWN_LEVEL),
+                       "failed to test AddPrinterDriver level 1");
+       }
+
+       info1.driver_name = r->driver_name;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_UNKNOWN_LEVEL),
+                       "failed to test AddPrinterDriverEx level 1");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_UNKNOWN_LEVEL),
+                       "failed to test AddPrinterDriver level 1");
+       }
+
+       return true;
+}
+
+static bool test_AddPrinterDriver_args_level_2(struct torture_context *tctx,
+                                              struct dcerpc_binding_handle *b,
+                                              const char *server_name,
+                                              struct spoolss_AddDriverInfo8 *r,
+                                              uint32_t flags,
+                                              bool ex)
+{
+       struct spoolss_AddDriverInfoCtr info_ctr;
+       struct spoolss_AddDriverInfo2 info2;
+
+       ZERO_STRUCT(info2);
+
+       info_ctr.level = 2;
+       info_ctr.info.info2 = &info2;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriverEx level 2");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriver level 2");
+       }
+
+       info2.driver_name = r->driver_name;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriverEx level 2");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriver level 2");
+       }
+
+       info2.version = r->version;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriverEx level 2");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriver level 2");
+       }
+
+       info2.architecture = r->architecture;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriverEx level 2");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriver level 2");
+       }
+
+       info2.driver_path = r->driver_path;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriverEx level 2");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriver level 2");
+       }
+
+       info2.data_file = r->data_file;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriverEx level 2");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriver level 2");
+       }
+
+       info2.config_file = r->config_file;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, 0, WERR_INVALID_PARAM),
+                       "failed to test AddPrinterDriverEx");
+       }
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_OK),
+                       "failed to test AddPrinterDriverEx level 2");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_OK),
+                       "failed to test AddPrinterDriver level 2");
+       }
+
+       torture_assert(tctx,
+               test_EnumPrinterDrivers_findone(tctx, b, server_name, r->architecture, 2, r->driver_name),
+               "failed to find added printer driver");
+
+       return true;
+}
+
+static bool test_AddPrinterDriver_args_level_3(struct torture_context *tctx,
+                                              struct dcerpc_binding_handle *b,
+                                              const char *server_name,
+                                              struct spoolss_AddDriverInfo8 *r,
+                                              uint32_t flags,
+                                              bool ex)
+{
+       struct spoolss_AddDriverInfoCtr info_ctr;
+       struct spoolss_AddDriverInfo3 info3;
+
+       info3.driver_name       = r->driver_name;
+       info3.version           = r->version;
+       info3.architecture      = r->architecture;
+       info3.driver_path       = r->driver_path;
+       info3.data_file         = r->data_file;
+       info3.config_file       = r->config_file;
+       info3.help_file         = r->help_file;
+       info3.monitor_name      = r->monitor_name;
+       info3.default_datatype  = r->default_datatype;
+       info3._ndr_size_dependent_files = r->_ndr_size_dependent_files;
+       info3.dependent_files   = r->dependent_files;
+
+       info_ctr.level = 3;
+       info_ctr.info.info3 = &info3;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_OK),
+                       "failed to test AddPrinterDriverEx level 3");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_OK),
+                       "failed to test AddPrinterDriver level 3");
+       }
+
+       torture_assert(tctx,
+               test_EnumPrinterDrivers_findone(tctx, b, server_name, r->architecture, 3, r->driver_name),
+               "failed to find added printer driver");
 
-       torture_assert(tctx, test_EnumPrinters_findname(tctx, b,
-                                                       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)
+static bool test_AddPrinterDriver_args_level_4(struct torture_context *tctx,
+                                              struct dcerpc_binding_handle *b,
+                                              const char *server_name,
+                                              struct spoolss_AddDriverInfo8 *r,
+                                              uint32_t flags,
+                                              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;
-       bool existing_printer_deleted = false;
-       struct dcerpc_binding_handle *b = p->binding_handle;
-
-       ZERO_STRUCT(devmode_ctr);
-       ZERO_STRUCT(secdesc_ctr);
-       ZERO_STRUCT(userlevel_ctr);
+       struct spoolss_AddDriverInfoCtr info_ctr;
+       struct spoolss_AddDriverInfo4 info4;
+
+       info4.version           = r->version;
+       info4.driver_name       = r->driver_name;
+       info4.architecture      = r->architecture;
+       info4.driver_path       = r->driver_path;
+       info4.data_file         = r->data_file;
+       info4.config_file       = r->config_file;
+       info4.help_file         = r->help_file;
+       info4.monitor_name      = r->monitor_name;
+       info4.default_datatype  = r->default_datatype;
+       info4._ndr_size_dependent_files = r->_ndr_size_dependent_files;
+       info4.dependent_files   = r->dependent_files;
+       info4._ndr_size_previous_names = r->_ndr_size_previous_names;
+       info4.previous_names = r->previous_names;
+
+       info_ctr.level = 4;
+       info_ctr.info.info4 = &info4;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_OK),
+                       "failed to test AddPrinterDriverEx level 4");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_OK),
+                       "failed to test AddPrinterDriver level 4");
+       }
 
-       torture_comment(tctx, "Testing AddPrinter%s level 2\n", ex ? "Ex":"");
+       torture_assert(tctx,
+               test_EnumPrinterDrivers_findone(tctx, b, server_name, r->architecture, 4, r->driver_name),
+               "failed to find added printer driver");
 
-       userlevel_ctr.level = 1;
+       return true;
+}
 
-       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;
+static bool test_AddPrinterDriver_args_level_6(struct torture_context *tctx,
+                                              struct dcerpc_binding_handle *b,
+                                              const char *server_name,
+                                              struct spoolss_AddDriverInfo8 *r,
+                                              uint32_t flags,
+                                              bool ex)
+{
+       struct spoolss_AddDriverInfoCtr info_ctr;
+       struct spoolss_AddDriverInfo6 info6;
+
+       info6.version           = r->version;
+       info6.driver_name       = r->driver_name;
+       info6.architecture      = r->architecture;
+       info6.driver_path       = r->driver_path;
+       info6.data_file         = r->data_file;
+       info6.config_file       = r->config_file;
+       info6.help_file         = r->help_file;
+       info6.monitor_name      = r->monitor_name;
+       info6.default_datatype  = r->default_datatype;
+       info6._ndr_size_dependent_files = r->_ndr_size_dependent_files;
+       info6.dependent_files   = r->dependent_files;
+       info6._ndr_size_previous_names = r->_ndr_size_previous_names;
+       info6.previous_names    = r->previous_names;
+       info6.driver_date       = r->driver_date;
+       info6.driver_version    = r->driver_version;
+       info6.manufacturer_name = r->manufacturer_name;
+       info6.manufacturer_url  = r->manufacturer_url;
+       info6.hardware_id       = r->hardware_id;
+       info6.provider          = r->provider;
+
+       info_ctr.level = 6;
+       info_ctr.info.info6 = &info6;
+
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_OK),
+                       "failed to test AddPrinterDriverEx level 6");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_UNKNOWN_LEVEL),
+                       "failed to test AddPrinterDriver level 6");
+       }
 
-       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;
+       /* spoolss_AddPrinterDriver does not deal with level 6 or 8 - gd */
 
- again:
+       if (!ex) {
+               return true;
+       }
 
-       /* try to add printer to printer list (level 2) */
+       torture_assert(tctx,
+               test_EnumPrinterDrivers_findone(tctx, b, server_name, r->architecture, 6, r->driver_name),
+               "failed to find added printer driver");
 
-       ZERO_STRUCT(info2);
+       return true;
+}
 
-       info_ctr.info.info2 = &info2;
-       info_ctr.level = 2;
+static bool test_AddPrinterDriver_args_level_8(struct torture_context *tctx,
+                                              struct dcerpc_binding_handle *b,
+                                              const char *server_name,
+                                              struct spoolss_AddDriverInfo8 *r,
+                                              uint32_t flags,
+                                              bool ex)
+{
+       struct spoolss_AddDriverInfoCtr info_ctr;
 
-       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx_r(b, tctx, &rex) :
-                                             dcerpc_spoolss_AddPrinter_r(b, 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");
+       info_ctr.level = 8;
+       info_ctr.info.info8 = r;
 
-       info2.printername = printername;
+       if (ex) {
+               torture_assert(tctx,
+                       test_AddPrinterDriverEx_exp(tctx, b, server_name, &info_ctr, flags, WERR_OK),
+                       "failed to test AddPrinterDriverEx level 8");
+       } else {
+               torture_assert(tctx,
+                       test_AddPrinterDriver_exp(tctx, b, server_name, &info_ctr, WERR_UNKNOWN_LEVEL),
+                       "failed to test AddPrinterDriver level 8");
+       }
 
-       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx_r(b, tctx, &rex) :
-                                             dcerpc_spoolss_AddPrinter_r(b, tctx, &r),
-               "failed to add printer");
-       result = ex ? rex.out.result : r.out.result;
+       /* spoolss_AddPrinterDriver does not deal with level 6 or 8 - gd */
 
-       if (W_ERROR_EQUAL(result, WERR_PRINTER_ALREADY_EXISTS)) {
-               struct policy_handle printer_handle;
+       if (!ex) {
+               return true;
+       }
 
-               if (existing_printer_deleted) {
-                       torture_fail(tctx, "already deleted printer still existing?");
-               }
+       torture_assert(tctx,
+               test_EnumPrinterDrivers_findone(tctx, b, server_name, r->architecture, 8, r->driver_name),
+               "failed to find added printer driver");
 
-               torture_assert(tctx, call_OpenPrinterEx(tctx, p, printername, NULL, &printer_handle),
-                       "failed to open printer handle");
+       return true;
+}
 
-               torture_assert(tctx, test_DeletePrinter(tctx, b, &printer_handle),
-                       "failed to delete printer");
+static bool test_DeletePrinterDriver_exp(struct torture_context *tctx,
+                                        struct dcerpc_binding_handle *b,
+                                        const char *server,
+                                        const char *driver,
+                                        const char *environment,
+                                        WERROR expected_result)
+{
+       struct spoolss_DeletePrinterDriver r;
 
-               torture_assert(tctx, test_ClosePrinter(tctx, b, &printer_handle),
-                       "failed to close server handle");
+       r.in.server = server;
+       r.in.architecture = environment;
+       r.in.driver = driver;
 
-               existing_printer_deleted = true;
+       torture_comment(tctx, "Testing DeletePrinterDriver(%s)\n", driver);
 
-               goto again;
-       }
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_DeletePrinterDriver_r(b, tctx, &r),
+               "DeletePrinterDriver failed");
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "DeletePrinterDriver failed with unexpected result");
 
-       torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PORT,
-               "unexpected result code");
+       return true;
+}
 
-       info2.portname = portname;
+static bool test_DeletePrinterDriverEx_exp(struct torture_context *tctx,
+                                          struct dcerpc_binding_handle *b,
+                                          const char *server,
+                                          const char *driver,
+                                          const char *environment,
+                                          uint32_t delete_flags,
+                                          uint32_t version,
+                                          WERROR expected_result)
+{
+       struct spoolss_DeletePrinterDriverEx r;
 
-       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx_r(b, tctx, &rex) :
-                                             dcerpc_spoolss_AddPrinter_r(b, 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");
+       r.in.server = server;
+       r.in.architecture = environment;
+       r.in.driver = driver;
+       r.in.delete_flags = delete_flags;
+       r.in.version = version;
 
-       info2.drivername = drivername;
+       torture_comment(tctx, "Testing DeletePrinterDriverEx(%s)\n", driver);
 
-       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx_r(b, tctx, &rex) :
-                                             dcerpc_spoolss_AddPrinter_r(b, tctx, &r),
-               "failed to add printer");
-       result = ex ? rex.out.result : r.out.result;
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_spoolss_DeletePrinterDriverEx_r(b, tctx, &r),
+               "DeletePrinterDriverEx failed");
+       torture_assert_werr_equal(tctx, r.out.result, expected_result,
+               "DeletePrinterDriverEx failed with unexpected result");
 
-       /* w2k8r2 allows to add printer w/o defining printprocessor */
+       return true;
+}
 
-       if (!W_ERROR_IS_OK(result)) {
-               torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PRINTPROCESSOR,
-                       "unexpected result code");
+static bool test_DeletePrinterDriver(struct torture_context *tctx,
+                                    struct dcerpc_binding_handle *b,
+                                    const char *server_name,
+                                    const char *driver,
+                                    const char *environment)
+{
+       torture_assert(tctx,
+               test_DeletePrinterDriver_exp(tctx, b, server_name, driver, "FOOBAR", WERR_INVALID_ENVIRONMENT),
+               "failed to delete driver");
 
-               info2.printprocessor = "winprint";
+       torture_assert(tctx,
+               test_DeletePrinterDriver_exp(tctx, b, server_name, driver, environment, WERR_OK),
+               "failed to delete driver");
 
-               torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx_r(b, tctx, &rex) :
-                                                     dcerpc_spoolss_AddPrinter_r(b, tctx, &r),
-                       "failed to add printer");
-               result = ex ? rex.out.result : r.out.result;
-               torture_assert_werr_ok(tctx, result,
-                       "failed to add printer");
+       if (test_EnumPrinterDrivers_findone(tctx, b, server_name, environment, 1, driver)) {
+               torture_fail(tctx, "deleted driver still enumerated");
        }
 
-       *handle_p = handle;
+       torture_assert(tctx,
+               test_DeletePrinterDriver_exp(tctx, b, server_name, driver, environment, WERR_UNKNOWN_PRINTER_DRIVER),
+               "2nd delete failed");
 
-       /* we are paranoid, really check if the printer is there now */
+       return true;
+}
 
-       torture_assert(tctx, test_EnumPrinters_findname(tctx, b,
-                                                       PRINTER_ENUM_LOCAL, 1,
-                                                       printername,
-                                                       &found),
-                       "failed to enum printers");
-       torture_assert(tctx, found, "failed to find newly added printer");
+static bool test_DeletePrinterDriverEx(struct torture_context *tctx,
+                                      struct dcerpc_binding_handle *b,
+                                      const char *server_name,
+                                      const char *driver,
+                                      const char *environment,
+                                      uint32_t delete_flags,
+                                      uint32_t version)
+{
+       torture_assert(tctx,
+               test_DeletePrinterDriverEx_exp(tctx, b, server_name, driver, "FOOBAR", delete_flags, version, WERR_INVALID_ENVIRONMENT),
+               "failed to delete driver");
 
-       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx_r(b, tctx, &rex) :
-                                             dcerpc_spoolss_AddPrinter_r(b, 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");
+       torture_assert(tctx,
+               test_DeletePrinterDriverEx_exp(tctx, b, server_name, driver, environment, delete_flags, version, WERR_OK),
+               "failed to delete driver");
+
+       if (test_EnumPrinterDrivers_findone(tctx, b, server_name, environment, 1, driver)) {
+               torture_fail(tctx, "deleted driver still enumerated");
+       }
+
+       torture_assert(tctx,
+               test_DeletePrinterDriverEx_exp(tctx, b, server_name, driver, environment, delete_flags, version, WERR_UNKNOWN_PRINTER_DRIVER),
+               "2nd delete failed");
 
        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)
+static bool test_PrinterDriver_args(struct torture_context *tctx,
+                                   struct dcerpc_binding_handle *b,
+                                   const char *server_name,
+                                   uint32_t level,
+                                   struct spoolss_AddDriverInfo8 *r,
+                                   uint32_t add_flags,
+                                   uint32_t delete_flags,
+                                   uint32_t delete_version,
+                                   bool ex)
 {
        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;
-               }
+       switch (level) {
+       case 1:
+               ret = test_AddPrinterDriver_args_level_1(tctx, b, server_name, r, add_flags, ex);
+               break;
+       case 2:
+               ret = test_AddPrinterDriver_args_level_2(tctx, b, server_name, r, add_flags, ex);
+               break;
+       case 3:
+               ret = test_AddPrinterDriver_args_level_3(tctx, b, server_name, r, add_flags, ex);
+               break;
+       case 4:
+               ret = test_AddPrinterDriver_args_level_4(tctx, b, server_name, r, add_flags, ex);
+               break;
+       case 6:
+               ret = test_AddPrinterDriver_args_level_6(tctx, b, server_name, r, add_flags, ex);
+               break;
+       case 8:
+               ret = test_AddPrinterDriver_args_level_8(tctx, b, server_name, r, add_flags, ex);
+               break;
+       default:
+               return 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;
+       if (ret == false) {
+               return ret;
        }
 
-       return ret;
-}
+       if (level == 1) {
+               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;
+       /* spoolss_AddPrinterDriver does not deal with level 6 or 8 - gd */
 
-       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 (!ex && (level == 6 || level == 8)) {
+               return ret;
        }
 
-       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;
+       if (ex) {
+               return test_DeletePrinterDriverEx(tctx, b, server_name, r->driver_name, r->architecture, delete_flags, r->version);
+       } else {
+               return test_DeletePrinterDriver(tctx, b, server_name, r->driver_name, r->architecture);
        }
-
-       return ret;
 }
 
-static bool test_printer_info(struct torture_context *tctx,
-                             struct dcerpc_binding_handle *b,
-                             struct policy_handle *handle)
+static bool fillup_printserver_info(struct torture_context *tctx,
+                                   struct dcerpc_pipe *p,
+                                   struct torture_driver_context *d)
 {
-       bool ret = true;
+       struct policy_handle server_handle;
+       struct dcerpc_binding_handle *b = p->binding_handle;
+       const char *server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 
-       if (torture_setting_bool(tctx, "samba3", false)) {
-               torture_skip(tctx, "skipping printer info cross tests against samba 3");
-       }
+       torture_assert(tctx,
+               test_OpenPrinter_server(tctx, p, &server_handle),
+               "failed to open printserver");
+       torture_assert(tctx,
+               test_get_environment(tctx, b, &server_handle, &d->remote.environment),
+               "failed to get environment");
+       torture_assert(tctx,
+               test_ClosePrinter(tctx, b, &server_handle),
+               "failed to close printserver");
 
-       if (!test_PrinterInfo(tctx, b, handle)) {
-               ret = false;
-       }
+       torture_assert(tctx,
+               test_GetPrinterDriverDirectory_getdir(tctx, b, server_name_slash,
+                       d->local.environment ? d->local.environment : d->remote.environment,
+                       &d->remote.driver_directory),
+               "failed to get driver directory");
 
-       if (!test_SetPrinter_errors(tctx, b, handle)) {
-               ret = false;
+       return true;
+}
+
+static const char *driver_directory_dir(const char *driver_directory)
+{
+       char *p;
+
+       p = strrchr(driver_directory, '\\');
+       if (p) {
+               return p+1;
        }
 
-       return ret;
+       return NULL;
 }
 
-static bool test_EnumPrinterKey(struct torture_context *tctx,
-                               struct dcerpc_binding_handle *b,
-                               struct policy_handle *handle,
-                               const char *key_name,
-                               const char ***array)
+static const char *driver_directory_share(struct torture_context *tctx,
+                                         const char *driver_directory)
 {
-       struct spoolss_EnumPrinterKey r;
-       uint32_t needed = 0;
-       union spoolss_KeyNames key_buffer;
-       int32_t offered[] = { 0, 1, 2, 3, 4, 5, -1, -2, -3, -4, -5, 256, 512, 1024, 2048 };
-       uint32_t _ndr_size;
-       int i;
+       const char *p;
+       char *tok;
 
-       r.in.handle = handle;
-       r.in.key_name = key_name;
-       r.out.key_buffer = &key_buffer;
-       r.out.needed = &needed;
-       r.out._ndr_size = &_ndr_size;
+       if (driver_directory[0] == '\\' && driver_directory[1] == '\\') {
+               driver_directory += 2;
+       }
 
-       for (i=0; i < ARRAY_SIZE(offered); i++) {
+       p = talloc_strdup(tctx, driver_directory);
 
-               if (offered[i] < 0 && needed) {
-                       if (needed <= 4) {
-                               continue;
-                       }
-                       r.in.offered = needed + offered[i];
-               } else {
-                       r.in.offered = offered[i];
-               }
+       torture_assert(tctx,
+               next_token_talloc(tctx, &p, &tok, "\\"),
+               "cannot explode uri");
+       torture_assert(tctx,
+               next_token_talloc(tctx, &p, &tok, "\\"),
+               "cannot explode uri");
+
+       return tok;
+}
 
-               ZERO_STRUCT(key_buffer);
+static bool upload_printer_driver_file(struct torture_context *tctx,
+                                      struct smbcli_state *cli,
+                                      struct torture_driver_context *d,
+                                      const char *file_name)
+{
+       XFILE *f;
+       int fnum;
+       uint8_t *buf;
+       int maxwrite = 64512;
+       off_t nread = 0;
+       size_t start = 0;
+       const char *remote_dir = driver_directory_dir(d->remote.driver_directory);
+       const char *local_name = talloc_asprintf(tctx, "%s/%s", d->local.driver_directory, file_name);
+       const char *remote_name = talloc_asprintf(tctx, "%s\\%s", remote_dir, file_name);
+
+       if (!file_name || strlen(file_name) == 0) {
+               return true;
+       }
 
-               torture_comment(tctx, "Testing EnumPrinterKey(%s) with %d offered\n", r.in.key_name, r.in.offered);
+       torture_comment(tctx, "Uploading %s to %s\n", local_name, remote_name);
 
-               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey_r(b, tctx, &r),
-                       "failed to call EnumPrinterKey");
-               if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
+       fnum = smbcli_open(cli->tree, remote_name, O_RDWR|O_CREAT|O_TRUNC, DENY_NONE);
+       if (fnum == -1) {
+               torture_fail(tctx, talloc_asprintf(tctx, "failed to open remote file: %s\n", remote_name));
+       }
 
-                       torture_assert(tctx, (_ndr_size == r.in.offered/2),
-                               talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
-                                       _ndr_size, r.in.offered/2));
+       f = x_fopen(local_name, O_RDONLY, 0);
+       if (f == NULL) {
+               torture_fail(tctx, talloc_asprintf(tctx, "failed to open local file: %s\n", local_name));
+       }
 
-                       r.in.offered = needed;
-                       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey_r(b, tctx, &r),
-                               "failed to call EnumPrinterKey");
+       buf = talloc_array(tctx, uint8_t, maxwrite);
+       if (!buf) {
+               return false;
+       }
+
+       while (!x_feof(f)) {
+               int n = maxwrite;
+               int ret;
+
+               if ((n = x_fread(buf, 1, n, f)) < 1) {
+                       if((n == 0) && x_feof(f))
+                               break; /* Empty local file. */
+
+                       torture_warning(tctx,
+                               "failed to read file: %s\n", strerror(errno));
+                       break;
                }
 
-               if (offered[i] > 0) {
-                       torture_assert_werr_ok(tctx, r.out.result,
-                               "failed to call EnumPrinterKey");
+               ret = smbcli_write(cli->tree, fnum, 0, buf, nread + start, n);
+
+               if (n != ret) {
+                       torture_warning(tctx,
+                               "failed to write file: %s\n", smbcli_errstr(cli->tree));
+                       break;
                }
 
-               torture_assert(tctx, (_ndr_size == r.in.offered/2),
-                       talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
-                               _ndr_size, r.in.offered/2));
+               nread += n;
+       }
 
-               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));
+       x_fclose(f);
 
-               torture_assert(tctx, (*r.out.needed <= _ndr_size * 2),
-                       talloc_asprintf(tctx, "EnumPrinterKey size mismatch: needed %d is not <= _ndr_size %d * 2", *r.out.needed, _ndr_size));
+       torture_assert_ntstatus_ok(tctx,
+               smbcli_close(cli->tree, fnum),
+               "failed to close file");
 
-               if (key_buffer.string_array) {
-                       uint32_t calc_needed = 0;
-                       int s;
-                       for (s=0; key_buffer.string_array[s]; s++) {
-                               calc_needed += strlen_m_term(key_buffer.string_array[s])*2;
-                       }
-                       if (!key_buffer.string_array[0]) {
-                               calc_needed += 2;
-                       }
-                       calc_needed += 2;
+       return true;
+}
 
-                       torture_assert_int_equal(tctx, *r.out.needed, calc_needed,
-                               "EnumPrinterKey unexpected size");
-               }
-       }
+static bool connect_printer_driver_share(struct torture_context *tctx,
+                                        const char *server_name,
+                                        const char *share_name,
+                                        struct smbcli_state **cli)
+{
+       struct smbcli_options smb_options;
+       struct smbcli_session_options smb_session_options;
 
-       if (array) {
-               *array = key_buffer.string_array;
-       }
+       torture_comment(tctx, "Connecting printer driver share '%s' on '%s'\n",
+               share_name, server_name);
+
+       lpcfg_smbcli_options(tctx->lp_ctx, &smb_options);
+       lpcfg_smbcli_session_options(tctx->lp_ctx, &smb_session_options);
+
+       torture_assert_ntstatus_ok(tctx,
+               smbcli_full_connection(tctx, cli, server_name,
+                                       lpcfg_smb_ports(tctx->lp_ctx),
+                                       share_name, NULL,
+                                       lpcfg_socket_options(tctx->lp_ctx),
+                                       cmdline_credentials,
+                                       lpcfg_resolve_context(tctx->lp_ctx),
+                                       tctx->ev,
+                                       &smb_options,
+                                       &smb_session_options,
+                                       lpcfg_gensec_settings(tctx, tctx->lp_ctx)),
+               "failed to open driver share");
 
        return true;
 }
 
-bool test_printer_keys(struct torture_context *tctx,
-                      struct dcerpc_binding_handle *b,
-                      struct policy_handle *handle)
+static bool upload_printer_driver(struct torture_context *tctx,
+                                 const char *server_name,
+                                 struct torture_driver_context *d)
 {
-       const char **key_array = NULL;
+       struct smbcli_state *cli;
+       const char *share_name = driver_directory_share(tctx, d->remote.driver_directory);
        int i;
 
-       torture_comment(tctx, "Testing Printer Keys\n");
+       torture_assert(tctx,
+               connect_printer_driver_share(tctx, server_name, share_name, &cli),
+               "failed to connect to driver share");
 
-       torture_assert(tctx, test_EnumPrinterKey(tctx, b, handle, "", &key_array),
-               "failed to call test_EnumPrinterKey");
+       torture_comment(tctx, "Uploading printer driver files to \\\\%s\\%s\n",
+               server_name, share_name);
 
-       for (i=0; key_array && key_array[i]; i++) {
-               torture_assert(tctx, test_EnumPrinterKey(tctx, b, 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, b, handle, key_array[i], NULL, NULL),
-                       "failed to call test_EnumPrinterDataEx");
+       torture_assert(tctx,
+               upload_printer_driver_file(tctx, cli, d, d->info8.driver_path),
+               "failed to upload driver_path");
+       torture_assert(tctx,
+               upload_printer_driver_file(tctx, cli, d, d->info8.data_file),
+               "failed to upload data_file");
+       torture_assert(tctx,
+               upload_printer_driver_file(tctx, cli, d, d->info8.config_file),
+               "failed to upload config_file");
+       torture_assert(tctx,
+               upload_printer_driver_file(tctx, cli, d, d->info8.help_file),
+               "failed to upload help_file");
+       if (d->info8.dependent_files) {
+               for (i=0; d->info8.dependent_files->string && d->info8.dependent_files->string[i] != NULL; i++) {
+                       torture_assert(tctx,
+                               upload_printer_driver_file(tctx, cli, d, d->info8.dependent_files->string[i]),
+                               "failed to upload dependent_files");
+               }
        }
 
-       torture_comment(tctx, "Printer Keys test succeeded\n\n");
+       talloc_free(cli);
 
        return true;
 }
 
-static bool test_one_printer(struct torture_context *tctx,
-                            struct dcerpc_pipe *p,
-                            struct policy_handle *handle,
-                            const char *name)
+static bool remove_printer_driver_file(struct torture_context *tctx,
+                                      struct smbcli_state *cli,
+                                      struct torture_driver_context *d,
+                                      const char *file_name)
 {
-       bool ret = true;
-       struct dcerpc_binding_handle *b = p->binding_handle;
+       const char *remote_name;
+       const char *remote_dir =  driver_directory_dir(d->remote.driver_directory);
 
-       if (!test_PausePrinter(tctx, b, handle)) {
-               ret = false;
+       if (!file_name || strlen(file_name) == 0) {
+               return true;
        }
 
-       if (!test_DoPrintTest(tctx, b, handle)) {
-               ret = false;
-       }
+       remote_name = talloc_asprintf(tctx, "%s\\%s", remote_dir, file_name);
 
-       if (!test_ResumePrinter(tctx, b, handle)) {
-               ret = false;
-       }
+       torture_comment(tctx, "Removing %s\n", remote_name);
 
-       if (!test_printer_info(tctx, b, handle)) {
-               ret = false;
-       }
+       torture_assert_ntstatus_ok(tctx,
+               smbcli_unlink(cli->tree, remote_name),
+               "failed to unlink");
 
-       if (!test_PrinterInfo_SD(tctx, b, handle)) {
-               ret = false;
-       }
+       return true;
+}
 
-       if (!test_PrinterInfo_DevMode(tctx, p, handle, name)) {
-               ret = false;
-       }
+static bool remove_printer_driver(struct torture_context *tctx,
+                                 const char *server_name,
+                                 struct torture_driver_context *d)
+{
+       struct smbcli_state *cli;
+       const char *share_name = driver_directory_share(tctx, d->remote.driver_directory);
+       int i;
 
-       if (!test_ChangeID(tctx, p, handle)) {
-               ret = false;
-       }
+       torture_assert(tctx,
+               connect_printer_driver_share(tctx, server_name, share_name, &cli),
+               "failed to connect to driver share");
 
-       if (!test_printer_keys(tctx, b, handle)) {
-               ret = false;
-       }
+       torture_comment(tctx, "Removing printer driver files from \\\\%s\\%s\n",
+               server_name, share_name);
 
-       if (!test_EnumPrinterData_consistency(tctx, p, handle)) {
-               ret = false;
+       torture_assert(tctx,
+               remove_printer_driver_file(tctx, cli, d, d->info8.driver_path),
+               "failed to remove driver_path");
+       torture_assert(tctx,
+               remove_printer_driver_file(tctx, cli, d, d->info8.data_file),
+               "failed to remove data_file");
+       if (!strequal(d->info8.config_file, d->info8.driver_path)) {
+               torture_assert(tctx,
+                       remove_printer_driver_file(tctx, cli, d, d->info8.config_file),
+                       "failed to remove config_file");
        }
-
-       if (!test_SetPrinterDataEx_matrix(tctx, p, handle, name, NULL, NULL)) {
-               ret = false;
+       torture_assert(tctx,
+               remove_printer_driver_file(tctx, cli, d, d->info8.help_file),
+               "failed to remove help_file");
+       if (d->info8.dependent_files) {
+               for (i=0; d->info8.dependent_files->string && d->info8.dependent_files->string[i] != NULL; i++) {
+                       if (strequal(d->info8.dependent_files->string[i], d->info8.driver_path) ||
+                           strequal(d->info8.dependent_files->string[i], d->info8.data_file) ||
+                           strequal(d->info8.dependent_files->string[i], d->info8.config_file) ||
+                           strequal(d->info8.dependent_files->string[i], d->info8.help_file)) {
+                               continue;
+                       }
+                       torture_assert(tctx,
+                               remove_printer_driver_file(tctx, cli, d, d->info8.dependent_files->string[i]),
+                               "failed to remove dependent_files");
+               }
        }
 
-       if (!test_PrinterData_winreg(tctx, p, handle, name)) {
-               ret = false;
-       }
+       talloc_free(cli);
 
-       if (!test_printer_rename(tctx, p, handle, name)) {
-               ret = false;
-       }
+       return true;
 
-       return ret;
 }
 
-static bool test_printer(struct torture_context *tctx,
-                        struct dcerpc_pipe *p)
+static bool test_add_driver_arg(struct torture_context *tctx,
+                               struct dcerpc_pipe *p,
+                               struct torture_driver_context *d)
 {
        bool ret = true;
-       struct policy_handle handle[2];
-       bool found = false;
-       const char *drivername = "Microsoft XPS Document Writer";
-       const char *portname = "LPT1:";
        struct dcerpc_binding_handle *b = p->binding_handle;
+       const char *server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+       uint32_t levels[] = { 1, 2, 3, 4, 6, 8 };
+       int i;
+       struct spoolss_AddDriverInfo8 info8;
+       uint32_t add_flags = APD_COPY_NEW_FILES;
+       uint32_t delete_flags = 0;
 
-       /* test printer created via AddPrinter */
+       ZERO_STRUCT(info8);
 
-       if (!test_AddPrinter(tctx, p, &handle[0], TORTURE_PRINTER, drivername, portname)) {
-               return false;
-       }
+       torture_comment(tctx, "Testing PrinterDriver%s '%s' for environment '%s'\n",
+               d->ex ? "Ex" : "", d->info8.driver_name, d->local.environment);
 
-       if (!test_one_printer(tctx, p, &handle[0], TORTURE_PRINTER)) {
-               ret = false;
-       }
+       torture_assert(tctx,
+               fillup_printserver_info(tctx, p, d),
+               "failed to fillup printserver info");
 
-       if (!test_DeletePrinter(tctx, b, &handle[0])) {
-               ret = false;
+       if (!directory_exist(d->local.driver_directory)) {
+               torture_skip(tctx, "Skipping Printer Driver test as no local driver is available");
        }
 
-       if (!test_EnumPrinters_findname(tctx, b, PRINTER_ENUM_LOCAL, 1,
-                                       TORTURE_PRINTER, &found)) {
-               ret = false;
-       }
+       torture_assert(tctx,
+               upload_printer_driver(tctx, dcerpc_server_name(p), d),
+               "failed to upload printer driver");
 
-       torture_assert(tctx, !found, "deleted printer still there");
+       info8.version           = d->info8.version;
+       info8.driver_name       = d->info8.driver_name;
+       info8.architecture      = d->local.environment;
+       info8.driver_path       = d->info8.driver_path;
+       info8.data_file         = d->info8.data_file;
+       info8.config_file       = d->info8.config_file;
 
-       /* test printer created via AddPrinterEx */
+       for (i=0; i < ARRAY_SIZE(levels); i++) {
 
-       if (!test_AddPrinterEx(tctx, p, &handle[1], TORTURE_PRINTER_EX, drivername, portname)) {
-               return false;
-       }
+               if (torture_setting_bool(tctx, "samba3", false)) {
+                       switch (levels[i]) {
+                       case 2:
+                       case 4:
+                       case 8:
+                               torture_comment(tctx, "skipping level %d against samba\n", levels[i]);
+                               continue;
+                       default:
+                               break;
+                       }
+               }
 
-       if (!test_one_printer(tctx, p, &handle[1], TORTURE_PRINTER_EX)) {
-               ret = false;
+               torture_comment(tctx,
+                       "Testing PrinterDriver%s '%s' add & delete level %d\n",
+                               d->ex ? "Ex" : "", info8.driver_name, levels[i]);
+
+               ret &= test_PrinterDriver_args(tctx, b, server_name_slash, levels[i], &info8, add_flags, delete_flags, d->info8.version, d->ex);
        }
 
-       if (!test_DeletePrinter(tctx, b, &handle[1])) {
-               ret = false;
+       info8.driver_path       = talloc_asprintf(tctx, "%s\\%s", d->remote.driver_directory, d->info8.driver_path);
+       info8.data_file         = talloc_asprintf(tctx, "%s\\%s", d->remote.driver_directory, d->info8.data_file);
+       if (d->info8.config_file) {
+               info8.config_file       = talloc_asprintf(tctx, "%s\\%s", d->remote.driver_directory, d->info8.config_file);
        }
 
-       if (!test_EnumPrinters_findname(tctx, b, PRINTER_ENUM_LOCAL, 1,
-                                       TORTURE_PRINTER_EX, &found)) {
-               ret = false;
+       for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+               if (torture_setting_bool(tctx, "samba3", false)) {
+                       switch (levels[i]) {
+                       case 2:
+                       case 4:
+                       case 8:
+                               torture_comment(tctx, "skipping level %d against samba\n", levels[i]);
+                               continue;
+                       default:
+                               break;
+                       }
+               }
+
+
+               torture_comment(tctx,
+                       "Testing PrinterDriver%s '%s' add & delete level %d (full unc paths)\n",
+                               d->ex ? "Ex" : "", info8.driver_name, levels[i]);
+
+               ret &= test_PrinterDriver_args(tctx, b, server_name_slash, levels[i], &info8, add_flags, delete_flags, d->info8.version, d->ex);
        }
 
-       torture_assert(tctx, !found, "deleted printer still there");
+       torture_assert(tctx,
+               remove_printer_driver(tctx, dcerpc_server_name(p), d),
+               "failed to remove printer driver");
+
+       torture_comment(tctx, "\n");
 
        return ret;
 }
 
-static bool test_architecture_buffer(struct torture_context *tctx,
-                                    struct dcerpc_pipe *p)
+static bool test_add_driver_ex_64(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p)
 {
-       struct spoolss_OpenPrinterEx r;
-       struct spoolss_UserLevel1 u1;
-       struct policy_handle handle;
-       uint32_t architectures[] = {
-               PROCESSOR_ARCHITECTURE_INTEL,
-               PROCESSOR_ARCHITECTURE_IA64,
-               PROCESSOR_ARCHITECTURE_AMD64
-       };
-       uint32_t needed[3];
-       int i;
-       struct dcerpc_binding_handle *b = p->binding_handle;
+       struct torture_driver_context *d;
 
-       for (i=0; i < ARRAY_SIZE(architectures); i++) {
+       d = talloc_zero(tctx, struct torture_driver_context);
 
-               torture_comment(tctx, "Testing OpenPrinterEx with architecture %d\n", architectures[i]);
+       d->info8.version                = SPOOLSS_DRIVER_VERSION_200X;
+       d->info8.driver_name            = TORTURE_DRIVER_EX;
+       d->info8.architecture           = NULL;
+       d->info8.driver_path            = talloc_strdup(d, "pscript5.dll");
+       d->info8.data_file              = talloc_strdup(d, "cups6.ppd");
+       d->info8.config_file            = talloc_strdup(d, "cupsui6.dll");
+       d->local.environment            = talloc_strdup(d, "Windows x64");
+       d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/x64");
+       d->ex                           = true;
 
-               u1.size = 0;
-               u1.client = NULL;
-               u1.user = NULL;
-               u1.build = 0;
-               u1.major = 3;
-               u1.minor = 0;
-               u1.processor = architectures[i];
+       return test_add_driver_arg(tctx, p, d);
+}
 
-               r.in.printername        = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
-               r.in.datatype           = NULL;
-               r.in.devmode_ctr.devmode= NULL;
-               r.in.access_mask        = SEC_FLAG_MAXIMUM_ALLOWED;
-               r.in.level               = 1;
-               r.in.userlevel.level1   = &u1;
-               r.out.handle            = &handle;
+static bool test_add_driver_ex_32(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p)
+{
+       struct torture_driver_context *d;
 
-               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_OpenPrinterEx_r(b, tctx, &r), "");
-               torture_assert_werr_ok(tctx, r.out.result, "");
+       d = talloc_zero(tctx, struct torture_driver_context);
 
-               {
-                       struct spoolss_EnumPrinters e;
-                       uint32_t count;
-                       union spoolss_PrinterInfo *info;
+       d->info8.version                = SPOOLSS_DRIVER_VERSION_200X;
+       d->info8.driver_name            = TORTURE_DRIVER_EX;
+       d->info8.architecture           = NULL;
+       d->info8.driver_path            = talloc_strdup(d, "pscript5.dll");
+       d->info8.data_file              = talloc_strdup(d, "cups6.ppd");
+       d->info8.config_file            = talloc_strdup(d, "cupsui6.dll");
+       d->local.environment            = talloc_strdup(d, "Windows NT x86");
+       d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/i386");
+       d->ex                           = true;
 
-                       e.in.flags = PRINTER_ENUM_LOCAL;
-                       e.in.server = NULL;
-                       e.in.level = 2;
-                       e.in.buffer = NULL;
-                       e.in.offered = 0;
-                       e.out.count = &count;
-                       e.out.info = &info;
-                       e.out.needed = &needed[i];
+       return test_add_driver_arg(tctx, p, d);
+}
 
-                       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinters_r(b, tctx, &e), "");
-#if 0
-                       torture_comment(tctx, "needed was %d\n", needed[i]);
-#endif
-               }
+static bool test_add_driver_64(struct torture_context *tctx,
+                              struct dcerpc_pipe *p)
+{
+       struct torture_driver_context *d;
 
-               torture_assert(tctx, test_ClosePrinter(tctx, b, &handle), "");
-       }
+       d = talloc_zero(tctx, struct torture_driver_context);
 
-       for (i=1; i < ARRAY_SIZE(architectures); i++) {
-               if (needed[i-1] != needed[i]) {
-                       torture_fail(tctx,
-                               talloc_asprintf(tctx, "needed size %d for architecture %d != needed size %d for architecture %d\n",
-                                               needed[i-1], architectures[i-1], needed[i], architectures[i]));
-               }
-       }
+       d->info8.version                = SPOOLSS_DRIVER_VERSION_200X;
+       d->info8.driver_name            = TORTURE_DRIVER;
+       d->info8.architecture           = NULL;
+       d->info8.driver_path            = talloc_strdup(d, "pscript5.dll");
+       d->info8.data_file              = talloc_strdup(d, "cups6.ppd");
+       d->info8.config_file            = talloc_strdup(d, "cupsui6.dll");
+       d->local.environment            = talloc_strdup(d, "Windows x64");
+       d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/x64");
+       d->ex                           = false;
 
-       return true;
+       return test_add_driver_arg(tctx, p, d);
 }
 
-bool torture_rpc_spoolss(struct torture_context *torture)
+static bool test_add_driver_32(struct torture_context *tctx,
+                              struct dcerpc_pipe *p)
 {
-       NTSTATUS status;
-       struct dcerpc_pipe *p;
-       struct dcerpc_binding_handle *b;
-       bool ret = true;
-       struct test_spoolss_context *ctx;
-       const char *environment = SPOOLSS_ARCHITECTURE_NT_X86;
+       struct torture_driver_context *d;
 
-       status = torture_rpc_connection(torture, &p, &ndr_table_spoolss);
-       if (!NT_STATUS_IS_OK(status)) {
-               return false;
-       }
-       b = p->binding_handle;
+       d = talloc_zero(tctx, struct torture_driver_context);
 
-       ctx = talloc_zero(torture, struct test_spoolss_context);
-
-       ret &= test_OpenPrinter_server(torture, p, &ctx->server_handle);
-       ret &= test_GetPrinterData_list(torture, p, &ctx->server_handle, &environment);
-       ret &= test_EnumForms_all(torture, b, &ctx->server_handle, true);
-       ret &= test_Forms(torture, b, &ctx->server_handle, true, NULL, NULL, NULL);
-       ret &= test_Forms_winreg(torture, b, &ctx->server_handle, true, NULL);
-       ret &= test_EnumPorts(torture, b, ctx);
-       ret &= test_GetPrinterDriverDirectory(torture, p, environment);
-       ret &= test_GetPrintProcessorDirectory(torture, p, environment);
-       ret &= test_EnumPrinterDrivers(torture, p, ctx, environment);
-       ret &= test_EnumPrinterDrivers(torture, p, ctx, SPOOLSS_ARCHITECTURE_ALL);
-       ret &= test_EnumMonitors(torture, b, ctx);
-       ret &= test_EnumPrintProcessors(torture, b, ctx, environment);
-       ret &= test_EnumPrintProcDataTypes(torture, b);
-       ret &= test_EnumPrinters(torture, b, ctx);
-       ret &= test_OpenPrinter_badname(torture, b, "__INVALID_PRINTER__");
-       ret &= test_OpenPrinter_badname(torture, b, "\\\\__INVALID_HOST__");
-       ret &= test_OpenPrinter_badname(torture, b, "");
-       ret &= test_OpenPrinter_badname(torture, b, "\\\\\\");
-       ret &= test_OpenPrinter_badname(torture, b, "\\\\\\__INVALID_PRINTER__");
-       ret &= test_OpenPrinter_badname(torture, b, talloc_asprintf(torture, "\\\\%s\\", dcerpc_server_name(p)));
-       ret &= test_OpenPrinter_badname(torture, b,
-                                       talloc_asprintf(torture, "\\\\%s\\__INVALID_PRINTER__", dcerpc_server_name(p)));
-
-
-       ret &= test_AddPort(torture, p);
-       ret &= test_EnumPorts_old(torture, p);
-       ret &= test_EnumPrinters_old(torture, p, environment);
-       ret &= test_EnumPrinterDrivers_old(torture, p, environment);
-       ret &= test_architecture_buffer(torture, p);
+       d->info8.version                = SPOOLSS_DRIVER_VERSION_200X;
+       d->info8.driver_name            = TORTURE_DRIVER;
+       d->info8.architecture           = NULL;
+       d->info8.driver_path            = talloc_strdup(d, "pscript5.dll");
+       d->info8.data_file              = talloc_strdup(d, "cups6.ppd");
+       d->info8.config_file            = talloc_strdup(d, "cupsui6.dll");
+       d->local.environment            = talloc_strdup(d, "Windows NT x86");
+       d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/i386");
+       d->ex                           = false;
 
-       return ret;
+       return test_add_driver_arg(tctx, p, d);
 }
 
-struct torture_suite *torture_rpc_spoolss_printer(TALLOC_CTX *mem_ctx)
+static bool test_add_driver_adobe(struct torture_context *tctx,
+                                 struct dcerpc_pipe *p)
+{
+       struct torture_driver_context *d;
+
+       d = talloc_zero(tctx, struct torture_driver_context);
+
+       d->info8.version                = SPOOLSS_DRIVER_VERSION_9X;
+       d->info8.driver_name            = TORTURE_DRIVER_ADOBE;
+       d->info8.architecture           = NULL;
+       d->info8.driver_path            = talloc_strdup(d, "ADOBEPS4.DRV");
+       d->info8.data_file              = talloc_strdup(d, "DEFPRTR2.PPD");
+       d->info8.config_file            = talloc_strdup(d, "ADOBEPS4.DRV");
+#if 0
+       d->info8.help_file              = talloc_strdup(d, "ADOBEPS4.HLP");
+       d->info8.monitor_name           = talloc_strdup(d, "PSMON.DLL");
+#endif
+       d->local.environment            = talloc_strdup(d, "Windows 4.0");
+       d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/adobe/");
+       d->ex                           = false;
+
+       return test_add_driver_arg(tctx, p, d);
+}
+
+static bool test_add_driver_adobe_cupsaddsmb(struct torture_context *tctx,
+                                            struct dcerpc_pipe *p)
+{
+       struct torture_driver_context *d;
+       struct spoolss_StringArray *a;
+
+       if (!torture_setting_bool(tctx, "samba3", false)) {
+               torture_skip(tctx, "skipping cupsaddsmb test which only works against samba3");
+       }
+
+       d = talloc_zero(tctx, struct torture_driver_context);
+
+       d->info8.version                = SPOOLSS_DRIVER_VERSION_9X;
+       d->info8.driver_name            = TORTURE_DRIVER_ADOBE_CUPSADDSMB;
+       d->info8.architecture           = NULL;
+       d->info8.driver_path            = talloc_strdup(d, "ADOBEPS4.DRV");
+       d->info8.data_file              = talloc_strdup(d, "DEFPRTR2.PPD");
+       d->info8.config_file            = NULL;
+       d->info8.help_file              = talloc_strdup(d, "ADOBEPS4.HLP");
+       d->info8.monitor_name           = talloc_strdup(d, "PSMON.DLL");
+       d->info8.default_datatype       = talloc_strdup(d, "RAW");
+
+       a                               = talloc_zero(d, struct spoolss_StringArray);
+       a->string                       = talloc_zero_array(a, const char *, 7);
+       a->string[0]                    = talloc_strdup(a->string, "ADOBEPS4.DRV");
+       a->string[1]                    = talloc_strdup(a->string, "DEFPRTR2.PPD");
+       a->string[2]                    = talloc_strdup(a->string, "ADOBEPS4.HLP");
+       a->string[3]                    = talloc_strdup(a->string, "PSMON.DLL");
+       a->string[4]                    = talloc_strdup(a->string, "ADFONTS.MFM");
+       a->string[5]                    = talloc_strdup(a->string, "ICONLIB.DLL");
+
+       d->info8.dependent_files        = a;
+       d->local.environment            = talloc_strdup(d, "Windows 4.0");
+       d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/adobe/");
+       d->ex                           = false;
+
+       return test_add_driver_arg(tctx, p, d);
+}
+
+struct torture_suite *torture_rpc_spoolss_driver(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS-PRINTER");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS-DRIVER");
 
        struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
-                                                       "printer", &ndr_table_spoolss);
+                                                       "driver", &ndr_table_spoolss);
+       torture_rpc_tcase_add_test(tcase, "add_driver_64", test_add_driver_64);
+       torture_rpc_tcase_add_test(tcase, "add_driver_ex_64", test_add_driver_ex_64);
+
+       torture_rpc_tcase_add_test(tcase, "add_driver_32", test_add_driver_32);
+       torture_rpc_tcase_add_test(tcase, "add_driver_ex_32", test_add_driver_ex_32);
+
+       torture_rpc_tcase_add_test(tcase, "add_driver_adobe", test_add_driver_adobe);
 
-       torture_rpc_tcase_add_test(tcase, "printer", test_printer);
+       torture_rpc_tcase_add_test(tcase, "add_driver_adobe_cupsaddsmb", test_add_driver_adobe_cupsaddsmb);
 
        return suite;
 }