Changeset 429 for trunk/server/source4/torture

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/rpc/spoolss.c (modified) (22 diffs)
• source4/torture/rpc/spoolss_win.c (modified) (3 diffs)

trunk/server/source4/torture/rpc/spoolss.c

@@ -29 +29 @@
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
 #include "param/param.h"
+#include "lib/registry/registry.h"
 
 #define TORTURE_WELLKNOWN_PRINTER       "torture_wkn_printer"
@@ -119 +120 @@
 
 #define CHECK_NEEDED_SIZE_ENUM_LEVEL(fn, info, level, count, ic, 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 round_size = DO_ROUND(size, align);\
@@ -125 +127 @@
                 CHECK_ALIGN(size, align);\
         }\
+        }\
 } while(0)
 
 #define CHECK_NEEDED_SIZE_ENUM(fn, info, count, ic, 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 round_size = DO_ROUND(size, align);\
@@ -134 +138 @@
                 CHECK_ALIGN(size, align);\
         }\
+        }\
 } while(0)
 
 #define CHECK_NEEDED_SIZE_LEVEL(fn, info, level, ic, needed, align) do { \
+        if (torture_setting_bool(tctx, "spoolss_check_size", false)) {\
         uint32_t size = ndr_size_##fn(info, level, ic, 0);\
         uint32_t round_size = DO_ROUND(size, align);\
@@ -142 +148 @@
                 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)
@@ -2186 +2193 @@
                                 const char *value_name,
                                 enum winreg_Type *type_p,
-                                union spoolss_PrinterData *data_p)
+                                uint8_t **data_p,
+                                uint32_t *needed_p)
 {
         NTSTATUS status;
@@ -2199 +2207 @@
         r.out.needed = &needed;
         r.out.type = &type;
-        r.out.data = &data;
+        r.out.data = talloc_zero_array(tctx, uint8_t, r.in.offered);
 
         torture_comment(tctx, "Testing GetPrinterData(%s)\n", r.in.value_name);
@@ -2208 +2216 @@
         if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
                 r.in.offered = needed;
-
+                r.out.data = talloc_zero_array(tctx, uint8_t, r.in.offered);
                 status = dcerpc_spoolss_GetPrinterData(p, tctx, &r);
                 torture_assert_ntstatus_ok(tctx, status, "GetPrinterData failed");
@@ -2223 +2231 @@
 
         if (data_p) {
-                *data_p = data;
+                *data_p = r.out.data;
+        }
+
+        if (needed_p) {
+                *needed_p = needed;
         }
 
@@ -2235 +2247 @@
                                   const char *value_name,
                                   enum winreg_Type *type_p,
-                                  union spoolss_PrinterData *data_p)
+                                  uint8_t **data_p,
+                                  uint32_t *needed_p)
 {
         NTSTATUS status;
@@ -2249 +2262 @@
         r.out.type = &type;
         r.out.needed = &needed;
-        r.out.data = &data;
+        r.out.data = talloc_zero_array(tctx, uint8_t, r.in.offered);
 
         torture_comment(tctx, "Testing GetPrinterDataEx(%s - %s)\n",
@@ -2265 +2278 @@
         if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
                 r.in.offered = needed;
+                r.out.data = talloc_zero_array(tctx, uint8_t, r.in.offered);
                 status = dcerpc_spoolss_GetPrinterDataEx(p, tctx, &r);
                 torture_assert_ntstatus_ok(tctx, status, "GetPrinterDataEx failed");
@@ -2279 +2293 @@
 
         if (data_p) {
-                *data_p = data;
+                *data_p = r.out.data;
+        }
+
+        if (needed_p) {
+                *needed_p = needed;
         }
 
@@ -2308 +2326 @@
         for (i=0; i < ARRAY_SIZE(list); i++) {
                 enum winreg_Type type, type_ex;
-                union spoolss_PrinterData data, data_ex;
-
-                torture_assert(tctx, test_GetPrinterData(tctx, p, handle, list[i], &type, &data),
+                uint8_t *data, *data_ex;
+                uint32_t needed, needed_ex;
+
+                torture_assert(tctx, test_GetPrinterData(tctx, p, 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),
+                torture_assert(tctx, test_GetPrinterDataEx(tctx, p, 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");
-                switch (type) {
-                case REG_SZ:
-                        torture_assert_str_equal(tctx, data.string, data_ex.string, "REG_SZ mismatch");
-                        break;
-                case REG_DWORD:
-                        torture_assert_int_equal(tctx, data.value, data_ex.value, "REG_DWORD mismatch");
-                        break;
-                case REG_BINARY:
-                        torture_assert_data_blob_equal(tctx, data.binary, data_ex.binary, "REG_BINARY mismatch");
-                        break;
-                default:
-                        break;
-                }
+                torture_assert_int_equal(tctx, needed, needed_ex, "needed mismatch");
+                torture_assert_mem_equal(tctx, data, data_ex, needed, "data mismatch");
         }
 
@@ -2380 +2388 @@
                 torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterData failed");
 
-                torture_assert(tctx, test_GetPrinterData(tctx, p, handle, r.out.value_name, NULL, NULL),
+                torture_assert(tctx, test_GetPrinterData(tctx, p, handle, r.out.value_name, NULL, NULL, NULL),
                         talloc_asprintf(tctx, "failed to call GetPrinterData for %s\n", r.out.value_name));
 
-                torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", r.out.value_name, NULL, NULL),
+                torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", r.out.value_name, NULL, NULL, NULL),
                         talloc_asprintf(tctx, "failed to call GetPrinterDataEx on PrinterDriverData for %s\n", r.out.value_name));
 
@@ -2526 +2534 @@
 
                 enum winreg_Type type;
-                union spoolss_PrinterData data;
+                uint8_t *data;
+                DATA_BLOB blob;
+                uint32_t needed;
+
+                torture_assert(tctx,
+                        reg_string_to_val(tctx, lp_iconv_convenience(tctx->lp_ctx),
+                                          "REG_SZ", "dog", &r.in.type, &blob), "");
 
                 r.in.handle = handle;
                 r.in.value_name = values[i];
                 r.in.type = REG_SZ;
-                r.in.data.string = "dog";
+                r.in.data = blob.data;
+                r.in.offered = blob.length;
 
                 torture_comment(tctx, "Testing SetPrinterData(%s)\n",
@@ -2541 +2556 @@
                 torture_assert_werr_ok(tctx, r.out.result, "SetPrinterData failed");
 
-                if (!test_GetPrinterData(tctx, p, handle, r.in.value_name, &type, &data)) {
+                if (!test_GetPrinterData(tctx, p, handle, r.in.value_name, &type, &data, &needed)) {
                         return false;
                 }
 
                 torture_assert_int_equal(tctx, r.in.type, type, "type mismatch");
-                torture_assert_str_equal(tctx, r.in.data.string, data.string, "data mismatch");
+                torture_assert_int_equal(tctx, r.in.offered, needed, "size mismatch");
+                torture_assert_mem_equal(tctx, blob.data, data, needed, "buffer mismatch");
 
                 if (!test_DeletePrinterData(tctx, p, handle, r.in.value_name)) {
@@ -2600 +2616 @@
                 enum winreg_Type type;
                 const char **subkeys;
-                union spoolss_PrinterData data;
+                uint8_t *data_out;
+                uint32_t needed;
 
                 r.in.handle = handle;
@@ -2606 +2623 @@
                 r.in.value_name = value_name;
                 r.in.type = REG_BINARY;
-                r.in.data.binary = blob;
+                r.in.data = blob.data;
+                r.in.offered = blob.length;
 
                 torture_comment(tctx, "Testing SetPrinterDataEx(%s - %s)\n", r.in.key_name, value_name);
@@ -2615 +2633 @@
                 torture_assert_werr_ok(tctx, r.out.result, "SetPrinterDataEx failed");
 
-                key = talloc_strdup(tctx, r.in.key_name);
-
-                if (!test_GetPrinterDataEx(tctx, p, handle, r.in.key_name, value_name, &type, &data)) {
+                if (!test_GetPrinterDataEx(tctx, p, handle, keys[i], value_name, &type, &data_out, &needed)) {
                         return false;
                 }
 
-                torture_assert_int_equal(tctx, r.in.type, type, "type mismatch");
-                torture_assert_data_blob_equal(tctx, blob, data.binary, "data mismatch");
+                torture_assert_int_equal(tctx, type, REG_BINARY, "type mismatch");
+                torture_assert_int_equal(tctx, needed, blob.length, "size mismatch");
+                torture_assert_mem_equal(tctx, data_out, blob.data, blob.length, "buffer mismatch");
+
+                key = talloc_strdup(tctx, keys[i]);
 
                 if (!test_EnumPrinterDataEx(tctx, p, handle, r.in.key_name)) {
@@ -2673 +2692 @@
 {
         enum winreg_Type type;
-        union spoolss_PrinterData data;
+        uint8_t *data;
+        uint32_t needed;
 
         torture_assert(tctx,
-                test_GetPrinterData(tctx, p, handle, "ChangeID", &type, &data),
+                test_GetPrinterData(tctx, p, handle, "ChangeID", &type, &data, &needed),
                 "failed to call GetPrinterData");
 
         torture_assert(tctx, type == REG_DWORD, "unexpected type");
-
-        *change_id = data.value;
+        torture_assert_int_equal(tctx, needed, 4, "unexpected size");
+
+        *change_id = IVAL(data, 0);
 
         return true;
@@ -2692 +2713 @@
 {
         enum winreg_Type type;
-        union spoolss_PrinterData data;
+        uint8_t *data;
+        uint32_t needed;
 
         torture_assert(tctx,
-                test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", "ChangeID", &type, &data),
+                test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", "ChangeID", &type, &data, &needed),
                 "failed to call GetPrinterData");
 
         torture_assert(tctx, type == REG_DWORD, "unexpected type");
-
-        *change_id = data.value;
+        torture_assert_int_equal(tctx, needed, 4, "unexpected size");
+
+        *change_id = IVAL(data, 0);
 
         return true;

trunk/server/source4/torture/rpc/spoolss_win.c

@@ -161 +161 @@
         uint32_t needed;
         enum winreg_Type type;
-        union spoolss_PrinterData data;
+        uint8_t *data = talloc_zero_array(tctx, uint8_t, 4);
 
         torture_comment(tctx, "Testing GetPrinterData(%s).\n", value_name);
@@ -169 +169 @@
         gpd.out.needed = &needed;
         gpd.out.type = &type;
-        gpd.out.data = &data;
+        gpd.out.data = data;
 
         status = dcerpc_spoolss_GetPrinterData(p, tctx, &gpd);
@@ -177 +177 @@
 
         if (W_ERROR_IS_OK(expected_werr)) {
-                torture_assert_int_equal(tctx, data.value,
+                uint32_t value = IVAL(data, 0);
+                torture_assert_int_equal(tctx, value,
                         expected_value,
                         talloc_asprintf(tctx, "GetPrinterData for %s did not return expected value.", value_name));