s4-smbtorture: more work on SD tests for RPC-SPOOLSS.
[ira/wip.git] / source4 / torture / rpc / spoolss.c
index 26083a7a20aa7794a331b5168b4068601ddcfb51..05eee623a5a0d266aee101565ba8d27569afc784 100644 (file)
@@ -5,7 +5,7 @@
    Copyright (C) Tim Potter 2003
    Copyright (C) Stefan Metzmacher 2005
    Copyright (C) Jelmer Vernooij 2007
-   Copyright (C) Guenther Deschner 2009
+   Copyright (C) Guenther Deschner 2009-2010
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
+#include "torture/rpc/rpc.h"
 #include "param/param.h"
 
 #define TORTURE_WELLKNOWN_PRINTER      "torture_wkn_printer"
@@ -42,8 +45,8 @@ struct test_spoolss_context {
        union spoolss_PortInfo *ports[3];
 
        /* for EnumPrinterDrivers */
-       uint32_t driver_count[7];
-       union spoolss_DriverInfo *drivers[7];
+       uint32_t driver_count[8];
+       union spoolss_DriverInfo *drivers[8];
 
        /* for EnumMonitors */
        uint32_t monitor_count[3];
@@ -80,7 +83,68 @@ struct test_spoolss_context {
        torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
 } while(0)
 
-#define COMPARE_STRING_ARRAY(tctx, c,r,e)
+#define COMPARE_UINT64(tctx, c, r, e) do {\
+       _CHECK_FIELD_SIZE(c, r, e, uint64_t); \
+       torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
+} while(0)
+
+
+#define COMPARE_NTTIME(tctx, c, r, e) do {\
+       _CHECK_FIELD_SIZE(c, r, e, NTTIME); \
+       torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
+} while(0)
+
+#define COMPARE_STRING_ARRAY(tctx, c,r,e) do {\
+       int __i; \
+       if (!c.e && !r.e) { \
+               break; \
+       } \
+       if (c.e && !r.e) { \
+               torture_fail(tctx, #r "." #e " field is NULL and " #c "." #e " is not\n"); \
+       } \
+       if (!c.e && r.e) { \
+               torture_fail(tctx, #c "." #e " field is NULL and " #r "." #e " is not\n"); \
+       } \
+       for (__i=0;c.e[__i] != NULL; __i++) { \
+               torture_assert_str_equal(tctx, c.e[__i], r.e[__i], "invalid value"); \
+       } \
+} while(0)
+
+#define CHECK_ALIGN(size, n) do {\
+       if (size % n) {\
+               torture_warning(tctx, "%d is *NOT* %d byte aligned, should be %d",\
+                       size, n, size + n - (size % n));\
+       }\
+} while(0)
+
+#define DO_ROUND(size, n) (((size)+((n)-1)) & ~((n)-1))
+
+#define CHECK_NEEDED_SIZE_ENUM_LEVEL(fn, info, level, count, ic, needed, align) do { \
+       uint32_t size = ndr_size_##fn##_info(tctx, ic, 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);\
+               CHECK_ALIGN(size, align);\
+       }\
+} while(0)
+
+#define CHECK_NEEDED_SIZE_ENUM(fn, info, count, ic, needed, align) do { \
+       uint32_t size = ndr_size_##fn##_info(tctx, ic, 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);\
+               CHECK_ALIGN(size, align);\
+       }\
+} while(0)
+
+#define CHECK_NEEDED_SIZE_LEVEL(fn, info, level, ic, needed, align) do { \
+       uint32_t size = ndr_size_##fn(info, level, ic, 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);\
+               CHECK_ALIGN(size, align);\
+       }\
+} while(0)
 
 static bool test_OpenPrinter_server(struct torture_context *tctx,
                                    struct dcerpc_pipe *p,
@@ -151,6 +215,8 @@ 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);
+
                ctx->port_count[level]  = count;
                ctx->ports[level]       = info;
        }
@@ -239,6 +305,8 @@ static bool test_GetPrintProcessorDirectory(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_GetPrintProcessorDirectory failed");
 
                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);
        }
 
        return true;
@@ -302,6 +370,8 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_GetPrinterDriverDirectory failed");
 
                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);
        }
 
        return true;
@@ -314,7 +384,7 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct spoolss_EnumPrinterDrivers r;
-       uint16_t levels[] = { 1, 2, 3, 4, 5, 6 };
+       uint16_t levels[] = { 1, 2, 3, 4, 5, 6, 8 };
        int i, j;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -358,6 +428,8 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDrivers failed");
 
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinterDrivers, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
                ctx->driver_count[level]        = count;
                ctx->drivers[level]             = info;
        }
@@ -375,57 +447,77 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx,
 
                for (j=0;j<ctx->driver_count[level];j++) {
                        union spoolss_DriverInfo *cur = &ctx->drivers[level][j];
-                       union spoolss_DriverInfo *ref = &ctx->drivers[6][j];
+                       union spoolss_DriverInfo *ref = &ctx->drivers[8][j];
+
                        switch (level) {
                        case 1:
-                               COMPARE_STRING(tctx, cur->info1, ref->info6, driver_name);
+                               COMPARE_STRING(tctx, cur->info1, ref->info8, driver_name);
                                break;
                        case 2:
-                               COMPARE_UINT32(tctx, cur->info2, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info2, ref->info6, config_file);
+                               COMPARE_UINT32(tctx, cur->info2, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info2, ref->info8, config_file);
                                break;
                        case 3:
-                               COMPARE_UINT32(tctx, cur->info3, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, config_file);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, help_file);
-                               COMPARE_STRING_ARRAY(tctx, cur->info3, ref->info6, dependent_files);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, monitor_name);
-                               COMPARE_STRING(tctx, cur->info3, ref->info6, default_datatype);
+                               COMPARE_UINT32(tctx, cur->info3, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, config_file);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, help_file);
+                               COMPARE_STRING_ARRAY(tctx, cur->info3, ref->info8, dependent_files);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, monitor_name);
+                               COMPARE_STRING(tctx, cur->info3, ref->info8, default_datatype);
                                break;
                        case 4:
-                               COMPARE_UINT32(tctx, cur->info4, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, config_file);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, help_file);
-                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info6, dependent_files);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, monitor_name);
-                               COMPARE_STRING(tctx, cur->info4, ref->info6, default_datatype);
-                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info6, previous_names);
+                               COMPARE_UINT32(tctx, cur->info4, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, config_file);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, help_file);
+                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info8, dependent_files);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, monitor_name);
+                               COMPARE_STRING(tctx, cur->info4, ref->info8, default_datatype);
+                               COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info8, previous_names);
                                break;
                        case 5:
-                               COMPARE_UINT32(tctx, cur->info5, ref->info6, version);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, driver_name);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, architecture);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, driver_path);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, data_file);
-                               COMPARE_STRING(tctx, cur->info5, ref->info6, config_file);
-                               /*COMPARE_UINT32(tctx, cur->info5, ref->info6, driver_attributes);*/
-                               /*COMPARE_UINT32(tctx, cur->info5, ref->info6, config_version);*/
-                               /*TODO: ! COMPARE_UINT32(tctx, cur->info5, ref->info6, driver_version); */
+                               COMPARE_UINT32(tctx, cur->info5, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info5, ref->info8, config_file);
+                               /*COMPARE_UINT32(tctx, cur->info5, ref->info8, driver_attributes);*/
+                               /*COMPARE_UINT32(tctx, cur->info5, ref->info8, config_version);*/
+                               /*TODO: ! COMPARE_UINT32(tctx, cur->info5, ref->info8, driver_version); */
                                break;
                        case 6:
-                               /* level 6 is our reference, and it makes no sense to compare it to itself */
+                               COMPARE_UINT32(tctx, cur->info6, ref->info8, version);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, driver_name);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, architecture);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, driver_path);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, data_file);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, config_file);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, help_file);
+                               COMPARE_STRING_ARRAY(tctx, cur->info6, ref->info8, dependent_files);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, monitor_name);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, default_datatype);
+                               COMPARE_STRING_ARRAY(tctx, cur->info6, ref->info8, previous_names);
+                               COMPARE_NTTIME(tctx, cur->info6, ref->info8, driver_date);
+                               COMPARE_UINT64(tctx, cur->info6, ref->info8, driver_version);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, manufacturer_name);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, manufacturer_url);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, hardware_id);
+                               COMPARE_STRING(tctx, cur->info6, ref->info8, provider);
+                               break;
+                       case 8:
+                               /* level 8 is our reference, and it makes no sense to compare it to itself */
                                break;
                        }
                }
@@ -479,6 +571,8 @@ 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);
+
                ctx->monitor_count[level]       = count;
                ctx->monitors[level]            = info;
        }
@@ -555,6 +649,8 @@ static bool test_EnumPrintProcessors(struct torture_context *tctx,
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcessors failed");
 
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcessors, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
                ctx->print_processor_count[level]       = count;
                ctx->print_processors[level]            = info;
        }
@@ -629,6 +725,9 @@ static bool test_EnumPrintProcDataTypes(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcDataTypes failed");
 
                torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcDataTypes failed");
+
+               CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcDataTypes, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
        }
 
        return true;
@@ -681,6 +780,8 @@ 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);
+
                ctx->printer_count[level]       = count;
                ctx->printers[level]            = info;
        }
@@ -761,40 +862,101 @@ static bool test_EnumPrinters(struct torture_context *tctx,
        return true;
 }
 
+static bool test_GetPrinterDriver2(struct torture_context *tctx,
+                                  struct dcerpc_pipe *p,
+                                  struct policy_handle *handle,
+                                  const char *driver_name);
+
+bool test_GetPrinter_level(struct torture_context *tctx,
+                          struct dcerpc_pipe *p,
+                          struct policy_handle *handle,
+                          uint32_t level,
+                          union spoolss_PrinterInfo *info)
+{
+       struct spoolss_GetPrinter r;
+       uint32_t needed;
+
+       r.in.handle = handle;
+       r.in.level = level;
+       r.in.buffer = NULL;
+       r.in.offered = 0;
+       r.out.needed = &needed;
+
+       torture_comment(tctx, "Testing GetPrinter level %u\n", r.in.level);
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinter(p, tctx, &r),
+               "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);
+               r.in.buffer = &blob;
+               r.in.offered = needed;
+
+               torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinter(p, tctx, &r),
+                       "GetPrinter failed");
+       }
+
+       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);
+
+       if (info && r.out.info) {
+               *info = *r.out.info;
+       }
+
+       return true;
+}
+
+
 static bool test_GetPrinter(struct torture_context *tctx,
                            struct dcerpc_pipe *p,
-                    struct policy_handle *handle)
+                           struct policy_handle *handle)
 {
-       NTSTATUS status;
-       struct spoolss_GetPrinter r;
-       uint16_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
+       uint32_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
        int i;
-       uint32_t needed;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
-               r.in.handle = handle;
-               r.in.level = levels[i];
-               r.in.buffer = NULL;
-               r.in.offered = 0;
-               r.out.needed = &needed;
 
-               torture_comment(tctx, "Testing GetPrinter level %u\n", r.in.level);
+               union spoolss_PrinterInfo info;
 
-               status = dcerpc_spoolss_GetPrinter(p, tctx, &r);
-               torture_assert_ntstatus_ok(tctx, status, "GetPrinter failed");
+               ZERO_STRUCT(info);
 
-               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_GetPrinter(p, tctx, &r);
+               torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, levels[i], &info),
+                       "failed to call GetPrinter");
+
+               if ((levels[i] == 2) && info.info2.drivername && strlen(info.info2.drivername)) {
+                       torture_assert(tctx,
+                               test_GetPrinterDriver2(tctx, p, handle, info.info2.drivername),
+                               "failed to call test_GetPrinterDriver2");
                }
+       }
 
-               torture_assert_ntstatus_ok(tctx, status, "GetPrinter failed");
+       return true;
+}
 
-               torture_assert_werr_ok(tctx, r.out.result, "GetPrinter failed");
-       }
+static bool test_SetPrinter(struct torture_context *tctx,
+                           struct dcerpc_pipe *p,
+                           struct policy_handle *handle,
+                           struct spoolss_SetPrinterInfoCtr *info_ctr,
+                           struct spoolss_DevmodeContainer *devmode_ctr,
+                           struct sec_desc_buf *secdesc_ctr,
+                           enum spoolss_PrinterControl command)
+{
+       struct spoolss_SetPrinter r;
+
+       r.in.handle = handle;
+       r.in.info_ctr = info_ctr;
+       r.in.devmode_ctr = devmode_ctr;
+       r.in.secdesc_ctr = secdesc_ctr;
+       r.in.command = command;
+
+       torture_comment(tctx, "Testing SetPrinter level %d\n", r.in.info_ctr->level);
+
+       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx, &r),
+               "failed to call SetPrinter");
+       torture_assert_werr_ok(tctx, r.out.result,
+               "failed to call SetPrinter");
 
        return true;
 }
@@ -841,8 +1003,8 @@ static bool test_SetPrinter_errors(struct torture_context *tctx,
                struct spoolss_SetPrinterInfo5 info5;
                struct spoolss_SetPrinterInfo6 info6;
                struct spoolss_SetPrinterInfo7 info7;
-               struct spoolss_DeviceModeInfo info8;
-               struct spoolss_DeviceModeInfo info9;
+               struct spoolss_SetPrinterInfo8 info8;
+               struct spoolss_SetPrinterInfo9 info9;
 
 
                info_ctr.level = levels[i];
@@ -963,8 +1125,8 @@ static bool test_SetPrinter_errors(struct torture_context *tctx,
 static void clear_info2(struct spoolss_SetPrinterInfoCtr *r)
 {
        if ((r->level == 2) && (r->info.info2)) {
-               r->info.info2->secdesc = NULL;
-               r->info.info2->devmode = NULL;
+               r->info.info2->secdesc_ptr = 0;
+               r->info.info2->devmode_ptr = 0;
        }
 }
 
@@ -1158,6 +1320,14 @@ static bool test_PrinterInfo(struct torture_context *tctx,
                        break; \
                }
 
+#define SD_EQUAL(sd1, sd2, field) \
+               if (!security_descriptor_equal(sd1, sd2)) { \
+                       torture_comment(tctx, "Failed to set %s (%s)\n", \
+                              #field, __location__); \
+                       ret = false; \
+                       break; \
+               }
+
 #define TEST_PRINTERINFO_STRING_EXP_ERR(lvl1, field1, lvl2, field2, value, err) do { \
                torture_comment(tctx, "field test %d/%s vs %d/%s\n", lvl1, #field1, lvl2, #field2); \
                q.in.level = lvl1; \
@@ -1357,6 +1527,357 @@ 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)
+{
+       if (sd1 == sd2) {
+               return true;
+       }
+
+       if (!sd1 || !sd2) {
+               torture_comment(tctx, "%s\n", __location__);
+               return false;
+       }
+
+       torture_assert_int_equal(tctx, sd1->revision, sd2->revision, "revision mismatch");
+       torture_assert_int_equal(tctx, sd1->type, sd2->type, "type mismatch");
+
+       torture_assert_sid_equal(tctx, sd1->owner_sid, sd2->owner_sid, "owner mismatch");
+       torture_assert_sid_equal(tctx, sd1->group_sid, sd2->group_sid, "group mismatch");
+
+       if (!security_acl_equal(sd1->sacl, sd2->sacl)) {
+               torture_comment(tctx, "%s: sacl mismatch\n", __location__);
+               NDR_PRINT_DEBUG(security_acl, sd1->sacl);
+               NDR_PRINT_DEBUG(security_acl, sd2->sacl);
+               return false;
+       }
+       if (!security_acl_equal(sd1->dacl, sd2->dacl)) {
+               torture_comment(tctx, "%s: dacl mismatch\n", __location__);
+               NDR_PRINT_DEBUG(security_acl, sd1->dacl);
+               NDR_PRINT_DEBUG(security_acl, sd2->dacl);
+               return false;
+       }
+
+       return true;
+}
+
+static bool test_sd_set_level(struct torture_context *tctx,
+                             struct dcerpc_pipe *p,
+                             struct policy_handle *handle,
+                             uint32_t level,
+                             struct security_descriptor *sd)
+{
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+
+       switch (level) {
+       case 2: {
+               union spoolss_PrinterInfo info;
+               struct spoolss_SetPrinterInfo2 info2;
+               torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+               info2.servername        = info.info2.servername;
+               info2.printername       = info.info2.printername;
+               info2.sharename         = info.info2.sharename;
+               info2.portname          = info.info2.portname;
+               info2.drivername        = info.info2.drivername;
+               info2.comment           = info.info2.comment;
+               info2.location          = info.info2.location;
+               info2.devmode_ptr       = 0;
+               info2.sepfile           = info.info2.sepfile;
+               info2.printprocessor    = info.info2.printprocessor;
+               info2.datatype          = info.info2.datatype;
+               info2.parameters        = info.info2.parameters;
+               info2.secdesc_ptr       = 0;
+               info2.attributes        = info.info2.attributes;
+               info2.priority          = info.info2.priority;
+               info2.defaultpriority   = info.info2.defaultpriority;
+               info2.starttime         = info.info2.starttime;
+               info2.untiltime         = info.info2.untiltime;
+               info2.status            = info.info2.status;
+               info2.cjobs             = info.info2.cjobs;
+               info2.averageppm        = info.info2.averageppm;
+
+               info_ctr.level = 2;
+               info_ctr.info.info2 = &info2;
+
+               break;
+       }
+       case 3: {
+               struct spoolss_SetPrinterInfo3 info3;
+
+               info3.sec_desc_ptr = 0;
+
+               info_ctr.level = 3;
+               info_ctr.info.info3 = &info3;
+
+               break;
+       }
+       default:
+               return false;
+       }
+
+       secdesc_ctr.sd = sd;
+
+       torture_assert(tctx,
+               test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0), "");
+
+       return true;
+}
+
+static bool test_PrinterInfo_SDs(struct torture_context *tctx,
+                                struct dcerpc_pipe *p,
+                                struct policy_handle *handle)
+{
+       union spoolss_PrinterInfo info;
+       struct security_descriptor *sd1, *sd2;
+       int i;
+
+       /* just compare level 2 and level 3 */
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+       sd1 = info.info2.secdesc;
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 3, &info), "");
+
+       sd2 = info.info3.secdesc;
+
+       torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2), "");
+
+
+       /* query level 2, set level 2, query level 2 */
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+       sd1 = info.info2.secdesc;
+
+       torture_assert(tctx, test_sd_set_level(tctx, p, handle, 2, sd1), "");
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+       sd2 = info.info2.secdesc;
+
+       torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2), "");
+
+
+       /* query level 2, set level 3, query level 2 */
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+       sd1 = info.info2.secdesc;
+
+       torture_assert(tctx, test_sd_set_level(tctx, p, handle, 3, sd1), "");
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+       sd2 = info.info2.secdesc;
+
+       torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2), "");
+
+
+       /* set modified sd level 3, query level 2 */
+
+       for (i=0; i < 93; i++) {
+               struct security_ace a;
+               const char *sid_string = talloc_asprintf(tctx, "S-1-5-32-9999%i", i);
+               a.type = SEC_ACE_TYPE_ACCESS_ALLOWED;
+               a.flags = 0;
+               a.size = 0; /* autogenerated */
+               a.access_mask = 0;
+               a.trustee = *dom_sid_parse_talloc(tctx, sid_string);
+               torture_assert_ntstatus_ok(tctx, security_descriptor_dacl_add(sd1, &a), "");
+       }
+
+       torture_assert(tctx, test_sd_set_level(tctx, p, handle, 3, sd1), "");
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+       sd2 = info.info2.secdesc;
+
+       if (sd1->type & SEC_DESC_DACL_DEFAULTED) {
+               torture_comment(tctx, "removing SEC_DESC_DACL_DEFAULTED\n");
+               sd1->type &= ~SEC_DESC_DACL_DEFAULTED;
+       }
+
+       torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2), "");
+
+       return true;
+}
+
+/*
+ * wrapper call that saves original sd, runs tests, and restores sd
+ */
+
+static bool test_PrinterInfo_SD(struct torture_context *tctx,
+                               struct dcerpc_pipe *p,
+                               struct policy_handle *handle)
+{
+       union spoolss_PrinterInfo info;
+       struct spoolss_SetPrinterInfo3 info3;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+       struct security_descriptor *sd;
+       bool ret = true;
+
+       /* save original sd */
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+       sd = security_descriptor_copy(tctx, info.info2.secdesc);
+
+       /* run tests */
+
+       ret = test_PrinterInfo_SDs(tctx, p, handle);
+
+       /* restore original sd */
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+
+       info3.sec_desc_ptr = 0;
+
+       info_ctr.level = 3;
+       info_ctr.info.info3 = &info3;
+
+       secdesc_ctr.sd = sd;
+
+       torture_assert(tctx,
+               test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0), "");
+
+       return ret;
+}
+
+static bool test_devicemode_equal(struct torture_context *tctx,
+                                 const struct spoolss_DeviceMode *d1,
+                                 const struct spoolss_DeviceMode *d2)
+{
+       if (d1 == d2) {
+               return true;
+       }
+
+       if (!d1 || !d2) {
+               torture_comment(tctx, "%s\n", __location__);
+               return false;
+       }
+       torture_assert_str_equal(tctx, d1->devicename, d2->devicename, "devicename mismatch");
+       torture_assert_int_equal(tctx, d1->specversion, d2->specversion, "specversion mismatch");
+       torture_assert_int_equal(tctx, d1->driverversion, d2->driverversion, "driverversion mismatch");
+       torture_assert_int_equal(tctx, d1->size, d2->size, "size mismatch");
+       torture_assert_int_equal(tctx, d1->__driverextra_length, d2->__driverextra_length, "__driverextra_length mismatch");
+       torture_assert_int_equal(tctx, d1->fields, d2->fields, "fields mismatch");
+       torture_assert_int_equal(tctx, d1->orientation, d2->orientation, "orientation mismatch");
+       torture_assert_int_equal(tctx, d1->papersize, d2->papersize, "papersize mismatch");
+       torture_assert_int_equal(tctx, d1->paperlength, d2->paperlength, "paperlength mismatch");
+       torture_assert_int_equal(tctx, d1->paperwidth, d2->paperwidth, "paperwidth mismatch");
+       torture_assert_int_equal(tctx, d1->scale, d2->scale, "scale mismatch");
+       torture_assert_int_equal(tctx, d1->copies, d2->copies, "copies mismatch");
+       torture_assert_int_equal(tctx, d1->defaultsource, d2->defaultsource, "defaultsource mismatch");
+       torture_assert_int_equal(tctx, d1->printquality, d2->printquality, "printquality mismatch");
+       torture_assert_int_equal(tctx, d1->color, d2->color, "color mismatch");
+       torture_assert_int_equal(tctx, d1->duplex, d2->duplex, "duplex mismatch");
+       torture_assert_int_equal(tctx, d1->yresolution, d2->yresolution, "yresolution mismatch");
+       torture_assert_int_equal(tctx, d1->ttoption, d2->ttoption, "ttoption mismatch");
+       torture_assert_int_equal(tctx, d1->collate, d2->collate, "collate mismatch");
+       torture_assert_str_equal(tctx, d1->formname, d2->formname, "formname mismatch");
+       torture_assert_int_equal(tctx, d1->logpixels, d2->logpixels, "logpixels mismatch");
+       torture_assert_int_equal(tctx, d1->bitsperpel, d2->bitsperpel, "bitsperpel mismatch");
+       torture_assert_int_equal(tctx, d1->pelswidth, d2->pelswidth, "pelswidth mismatch");
+       torture_assert_int_equal(tctx, d1->pelsheight, d2->pelsheight, "pelsheight mismatch");
+       torture_assert_int_equal(tctx, d1->displayflags, d2->displayflags, "displayflags mismatch");
+       torture_assert_int_equal(tctx, d1->displayfrequency, d2->displayfrequency, "displayfrequency mismatch");
+       torture_assert_int_equal(tctx, d1->icmmethod, d2->icmmethod, "icmmethod mismatch");
+       torture_assert_int_equal(tctx, d1->icmintent, d2->icmintent, "icmintent mismatch");
+       torture_assert_int_equal(tctx, d1->mediatype, d2->mediatype, "mediatype mismatch");
+       torture_assert_int_equal(tctx, d1->dithertype, d2->dithertype, "dithertype mismatch");
+       torture_assert_int_equal(tctx, d1->reserved1, d2->reserved1, "reserved1 mismatch");
+       torture_assert_int_equal(tctx, d1->reserved2, d2->reserved2, "reserved2 mismatch");
+       torture_assert_int_equal(tctx, d1->panningwidth, d2->panningwidth, "panningwidth mismatch");
+       torture_assert_int_equal(tctx, d1->panningheight, d2->panningheight, "panningheight mismatch");
+       torture_assert_data_blob_equal(tctx, d1->driverextra_data, d2->driverextra_data, "driverextra_data mismatch");
+
+       return true;
+}
+
+static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
+                                     struct dcerpc_pipe *p,
+                                     struct policy_handle *handle)
+{
+       union spoolss_PrinterInfo info;
+       struct spoolss_DeviceMode *devmode;
+       struct spoolss_DeviceMode *devmode2;
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 8, &info), "");
+
+       devmode = info.info8.devmode;
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+       devmode2 = info.info2.devmode;
+
+       torture_assert(tctx, test_devicemode_equal(tctx, devmode, devmode2), "");
+
+       return true;
+}
+
+/*
+ * wrapper call that saves original devmode, runs tests, and restores devmode
+ */
+
+static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
+                                    struct dcerpc_pipe *p,
+                                    struct policy_handle *handle)
+{
+       union spoolss_PrinterInfo info;
+       struct spoolss_SetPrinterInfo8 info8;
+       struct spoolss_SetPrinterInfoCtr info_ctr;
+       struct spoolss_DevmodeContainer devmode_ctr;
+       struct sec_desc_buf secdesc_ctr;
+       struct spoolss_DeviceMode *devmode;
+       bool ret = true;
+
+       /* save original devmode */
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 8, &info), "");
+
+       devmode = info.info8.devmode;
+
+       /* run tests */
+
+       ret = test_PrinterInfo_DevModes(tctx, p, handle);
+
+       /* restore original devmode */
+
+       ZERO_STRUCT(devmode_ctr);
+       ZERO_STRUCT(secdesc_ctr);
+
+       info8.devmode_ptr = 0;
+
+       info_ctr.level = 8;
+       info_ctr.info.info8 = &info8;
+
+       devmode_ctr.devmode = devmode;
+
+       torture_assert(tctx,
+               test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0), "");
+
+       return ret;
+}
 
 static bool test_ClosePrinter(struct torture_context *tctx,
                              struct dcerpc_pipe *p,
@@ -1414,6 +1935,8 @@ static bool test_GetForm(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);
+
        return true;
 }
 
@@ -1473,6 +1996,8 @@ static bool test_EnumForms(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "EnumForms failed");
 
                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);
        }
 
        return true;
@@ -1642,6 +2167,8 @@ 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);
+
        return true;
 }
 
@@ -1725,6 +2252,8 @@ static bool test_GetJob(struct torture_context *tctx,
                }
                torture_assert(tctx, r.out.info, "No job info returned");
                torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
+
+               CHECK_NEEDED_SIZE_LEVEL(spoolss_JobInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
        }
 
        return true;
@@ -1850,6 +2379,8 @@ static bool test_EnumJobs(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);
+
                for (j = 0; j < count; j++) {
 
                        torture_assert(tctx, test_GetJob(tctx, p, handle, info[j].info1.job_id),
@@ -2045,6 +2576,8 @@ 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);
+
        if (type_p) {
                *type_p = type;
        }
@@ -2099,6 +2632,8 @@ 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);
+
        if (type_p) {
                *type_p = type;
        }
@@ -2247,6 +2782,8 @@ 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);
+
        return true;
 }
 
@@ -2490,6 +3027,181 @@ static bool test_SetPrinterDataEx(struct torture_context *tctx,
        return true;
 }
 
+static bool test_GetChangeID_PrinterData(struct torture_context *tctx,
+                                        struct dcerpc_pipe *p,
+                                        struct policy_handle *handle,
+                                        uint32_t *change_id)
+{
+       enum winreg_Type type;
+       union spoolss_PrinterData data;
+
+       torture_assert(tctx,
+               test_GetPrinterData(tctx, p, handle, "ChangeID", &type, &data),
+               "failed to call GetPrinterData");
+
+       torture_assert(tctx, type == REG_DWORD, "unexpected type");
+
+       *change_id = data.value;
+
+       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;
+       union spoolss_PrinterData data;
+
+       torture_assert(tctx,
+               test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", "ChangeID", &type, &data),
+               "failed to call GetPrinterData");
+
+       torture_assert(tctx, type == REG_DWORD, "unexpected type");
+
+       *change_id = data.value;
+
+       return true;
+}
+
+static bool test_GetChangeID_PrinterInfo(struct torture_context *tctx,
+                                        struct dcerpc_pipe *p,
+                                        struct policy_handle *handle,
+                                        uint32_t *change_id)
+{
+       union spoolss_PrinterInfo info;
+
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, 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;
+
+
+       torture_comment(tctx, "Testing ChangeID: id change test #1\n");
+
+       torture_assert(tctx, test_GetChangeID_PrinterData(tctx, p, 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, p, handle, &change_id_info),
+               "failed to query for ChangeID");
+
+       torture_assert_int_equal(tctx, change_id, change_id_ex,
+               "change_ids should all be equal");
+       torture_assert_int_equal(tctx, change_id_ex, change_id_info,
+               "change_ids should all be equal");
+
+
+       torture_comment(tctx, "Testing ChangeID: id change test #2\n");
+
+       torture_assert(tctx, test_GetChangeID_PrinterData(tctx, p, handle, &change_id),
+               "failed to query for ChangeID");
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
+               "failed to query Printer level 2");
+       torture_assert(tctx, test_GetChangeID_PrinterDataEx(tctx, p, handle, &change_id_ex),
+               "failed to query for ChangeID");
+       torture_assert(tctx, test_GetChangeID_PrinterInfo(tctx, p, handle, &change_id_info),
+               "failed to query for ChangeID");
+       torture_assert_int_equal(tctx, change_id, change_id_ex,
+               "change_id should not have changed");
+       torture_assert_int_equal(tctx, change_id_ex, change_id_info,
+               "change_id should not have changed");
+
+
+       torture_comment(tctx, "Testing ChangeID: id change test #3\n");
+
+       torture_assert(tctx, test_GetChangeID_PrinterData(tctx, p, 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, p, handle, &change_id_info),
+               "failed to query for ChangeID");
+       torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
+               "failed to query Printer level 2");
+       comment = talloc_strdup(tctx, info.info2.comment);
+
+       {
+               struct spoolss_SetPrinterInfoCtr info_ctr;
+               struct spoolss_DevmodeContainer devmode_ctr;
+               struct sec_desc_buf secdesc_ctr;
+               struct spoolss_SetPrinterInfo2 info2;
+
+               ZERO_STRUCT(info_ctr);
+               ZERO_STRUCT(devmode_ctr);
+               ZERO_STRUCT(secdesc_ctr);
+
+               info2.servername        = info.info2.servername;
+               info2.printername       = info.info2.printername;
+               info2.sharename         = info.info2.sharename;
+               info2.portname          = info.info2.portname;
+               info2.drivername        = info.info2.drivername;
+               info2.comment           = "torture_comment";
+               info2.location          = info.info2.location;
+               info2.devmode_ptr       = 0;
+               info2.sepfile           = info.info2.sepfile;
+               info2.printprocessor    = info.info2.printprocessor;
+               info2.datatype          = info.info2.datatype;
+               info2.parameters        = info.info2.parameters;
+               info2.secdesc_ptr       = 0;
+               info2.attributes        = info.info2.attributes;
+               info2.priority          = info.info2.priority;
+               info2.defaultpriority   = info.info2.defaultpriority;
+               info2.starttime         = info.info2.starttime;
+               info2.untiltime         = info.info2.untiltime;
+               info2.status            = info.info2.status;
+               info2.cjobs             = info.info2.cjobs;
+               info2.averageppm        = info.info2.averageppm;
+
+               info_ctr.level = 2;
+               info_ctr.info.info2 = &info2;
+
+               torture_assert(tctx, test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0),
+                       "failed to call SetPrinter");
+
+               info2.comment           = comment;
+
+               torture_assert(tctx, test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0),
+                       "failed to call SetPrinter");
+
+       }
+
+       torture_assert(tctx, test_GetChangeID_PrinterData(tctx, p, handle, &change_id2),
+               "failed to query for ChangeID");
+       torture_assert(tctx, test_GetChangeID_PrinterDataEx(tctx, p, handle, &change_id_ex2),
+               "failed to query for ChangeID");
+       torture_assert(tctx, test_GetChangeID_PrinterInfo(tctx, p, handle, &change_id_info2),
+               "failed to query for ChangeID");
+
+       torture_assert_int_equal(tctx, change_id2, change_id_ex2,
+               "change_ids should all be equal");
+       torture_assert_int_equal(tctx, change_id_ex2, change_id_info2,
+               "change_ids should all be equal");
+
+       torture_assert(tctx, (change_id < change_id2),
+               talloc_asprintf(tctx, "change_id %d needs to be larger than change_id %d",
+               change_id2, change_id));
+       torture_assert(tctx, (change_id_ex < change_id_ex2),
+               talloc_asprintf(tctx, "change_id %d needs to be larger than change_id %d",
+               change_id_ex2, change_id_ex));
+       torture_assert(tctx, (change_id_info < change_id_info2),
+               talloc_asprintf(tctx, "change_id %d needs to be larger than change_id %d",
+               change_id_info2, change_id_info));
+
+       return true;
+}
 
 static bool test_SecondaryClosePrinter(struct torture_context *tctx,
                                       struct dcerpc_pipe *p,
@@ -2676,6 +3388,10 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
                return false;
        }
 
+       if (!test_PrinterInfo_SD(tctx, p, &handle)) {
+               ret = false;
+       }
+
        if (!test_GetPrinter(tctx, p, &handle)) {
                ret = false;
        }
@@ -2720,6 +3436,10 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
                ret = false;
        }
 
+       if (!test_ChangeID(tctx, p, &handle)) {
+               ret = false;
+       }
+
        if (!torture_setting_bool(tctx, "samba3", false)) {
                if (!test_SecondaryClosePrinter(tctx, p, &handle)) {
                        ret = false;
@@ -2773,6 +3493,8 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi
 
                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);
+
                if (!info) {
                        torture_comment(tctx, "No printers returned\n");
                        return true;
@@ -2835,6 +3557,8 @@ static bool test_GetPrinterDriver(struct torture_context *tctx,
        torture_assert_werr_ok(tctx, r.out.result,
                "failed to call GetPrinterDriver");
 
+       CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
        return true;
 }
 
@@ -2844,36 +3568,55 @@ static bool test_GetPrinterDriver2(struct torture_context *tctx,
                                   const char *driver_name)
 {
        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 = "W32X86";
-       r.in.level = 1;
-       r.in.buffer = NULL;
-       r.in.offered = 0;
-       r.in.client_major_version = 0;
+       r.in.architecture = SPOOLSS_ARCHITECTURE_NT_X86;
+       r.in.client_major_version = 3;
        r.in.client_minor_version = 0;
        r.out.needed = &needed;
        r.out.server_major_version = &server_major_version;
        r.out.server_minor_version = &server_minor_version;
 
-       torture_comment(tctx, "Testing GetPrinterDriver2 level %d\n", r.in.level);
+       for (i=0;i<ARRAY_SIZE(levels);i++) {
+
+               r.in.buffer = NULL;
+               r.in.offered = 0;
+               r.in.level = levels[i];
+
+               torture_comment(tctx, "Testing GetPrinterDriver2(%s) level %d\n",
+                       driver_name, r.in.level);
 
-       torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r),
-               "failed to call GetPrinterDriver2");
-       if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-               DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
-               data_blob_clear(&blob);
-               r.in.buffer = &blob;
-               r.in.offered = needed;
                torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r),
                        "failed to call GetPrinterDriver2");
-       }
+               if (W_ERROR_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(p, tctx, &r),
+                               "failed to call GetPrinterDriver2");
+               }
 
-       torture_assert_werr_ok(tctx, r.out.result,
-               "failed to call GetPrinterDriver2");
+               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");
+
+               CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+       }
 
        return true;
 }
@@ -2923,6 +3666,8 @@ static bool test_EnumPrinterDrivers_old(struct torture_context *tctx,
                        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;
@@ -3198,17 +3943,22 @@ static bool test_AddPrinter_normal(struct torture_context *tctx,
                                              dcerpc_spoolss_AddPrinter(p, tctx, &r),
                "failed to add printer");
        result = ex ? rex.out.result : r.out.result;
-       torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PRINTPROCESSOR,
-               "unexpected result code");
 
-       info2.printprocessor = "winprint";
+       /* w2k8r2 allows to add printer w/o defining printprocessor */
 
-       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
-                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
-               "failed to add printer");
-       result = ex ? rex.out.result : r.out.result;
-       torture_assert_werr_ok(tctx, result,
-               "failed to add printer");
+       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(p, tctx, &rex) :
+                                                     dcerpc_spoolss_AddPrinter(p, tctx, &r),
+                       "failed to add printer");
+               result = ex ? rex.out.result : r.out.result;
+               torture_assert_werr_ok(tctx, result,
+                       "failed to add printer");
+       }
 
        *handle_p = handle;
 
@@ -3307,35 +4057,79 @@ static bool test_EnumPrinterKey(struct torture_context *tctx,
                                const char ***array)
 {
        struct spoolss_EnumPrinterKey r;
-       uint32_t needed;
-       struct spoolss_StringArray2 key_buffer;
+       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.in.offered = 0;
        r.out.key_buffer = &key_buffer;
        r.out.needed = &needed;
+       r.out._ndr_size = &_ndr_size;
 
-       torture_comment(tctx, "Testing EnumPrinterKey(%s)\n", r.in.key_name);
+       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(p, tctx, &r),
-               "failed to call EnumPrinterKey");
-       if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
-               torture_assert(tctx, (key_buffer._ndr_size == 0),
-                       talloc_asprintf(tctx, "EnumPrinterKey did not return 0 _ndr_size (but %d), windows clients would abort here!", key_buffer._ndr_size));
-               r.in.offered = needed;
                torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey(p, tctx, &r),
                        "failed to call EnumPrinterKey");
-       }
-       torture_assert_werr_ok(tctx, r.out.result,
-               "failed to call EnumPrinterKey");
+               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(p, 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, (key_buffer._ndr_size * 2 == needed),
-               talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
-               key_buffer._ndr_size, needed/2));
+               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 = key_buffer.string_array;
        }
 
        return true;
@@ -3382,6 +4176,14 @@ static bool test_printer(struct torture_context *tctx,
                ret = false;
        }
 
+       if (!test_PrinterInfo_SD(tctx, p, &handle[0])) {
+               ret = false;
+       }
+
+       if (!test_PrinterInfo_DevMode(tctx, p, &handle[0])) {
+               ret = false;
+       }
+
        if (!test_printer_keys(tctx, p, &handle[0])) {
                ret = false;
        }