Changeset 429 for trunk/server/source3/rpcclient/cmd_spoolss.c

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)
• source3/rpcclient/cmd_spoolss.c (modified) (11 diffs)

trunk/server/source3/rpcclient/cmd_spoolss.c

@@ -750 +750 @@
 static void display_printer_data(const char *v,
                                  enum winreg_Type type,
-                                 union spoolss_PrinterData *r)
+                                 uint8_t *data,
+                                 uint32_t length)
 {
         int i;
+        union spoolss_PrinterData r;
+        DATA_BLOB blob = data_blob_const(data, length);
+        WERROR result;
+
+        result = pull_spoolss_PrinterData(talloc_tos(), &blob, &r, type);
+        if (!W_ERROR_IS_OK(result)) {
+                return;
+        }
 
         switch (type) {
         case REG_DWORD:
-                printf("%s: REG_DWORD: 0x%08x\n", v, r->value);
+                printf("%s: REG_DWORD: 0x%08x\n", v, r.value);
                 break;
         case REG_SZ:
-                printf("%s: REG_SZ: %s\n", v, r->string);
+                printf("%s: REG_SZ: %s\n", v, r.string);
                 break;
         case REG_BINARY: {
                 char *hex = hex_encode_talloc(NULL,
-                        r->binary.data, r->binary.length);
+                        r.binary.data, r.binary.length);
                 size_t len;
                 printf("%s: REG_BINARY:", v);
@@ -782 +791 @@
         case REG_MULTI_SZ:
                 printf("%s: REG_MULTI_SZ: ", v);
-                for (i=0; r->string_array[i] != NULL; i++) {
-                        printf("%s ", r->string_array[i]);
+                for (i=0; r.string_array[i] != NULL; i++) {
+                        printf("%s ", r.string_array[i]);
                 }
                 printf("\n");
@@ -805 +814 @@
         const char *valuename;
         enum winreg_Type type;
-        union spoolss_PrinterData data;
+        uint8_t *data;
+        uint32_t needed;
 
         if (argc != 3) {
@@ -838 +848 @@
                                                0,
                                                &type,
+                                               &needed,
                                                &data);
         if (!W_ERROR_IS_OK(result))
@@ -844 +855 @@
         /* Display printer data */
 
-        display_printer_data(valuename, type, &data);
+        display_printer_data(valuename, type, data, needed);
 
  done:
@@ -867 +878 @@
 
         enum winreg_Type type;
-        union spoolss_PrinterData data;
+        uint8_t *data = NULL;
         uint32_t offered = 0;
         uint32_t needed;
@@ -899 +910 @@
         /* Get printer info */
 
+        data = talloc_zero_array(mem_ctx, uint8_t, offered);
+        if (!data) {
+                goto done;
+        }
+
         status = rpccli_spoolss_GetPrinterDataEx(cli, mem_ctx,
                                                  &pol,
                                                  keyname,
                                                  valuename,
+                                                 &type,
+                                                 data,
                                                  offered,
-                                                 &type,
-                                                 &data,
                                                  &needed,
                                                  &result);
         if (W_ERROR_EQUAL(result, WERR_MORE_DATA)) {
                 offered = needed;
+                data = talloc_zero_array(mem_ctx, uint8_t, offered);
+                if (!data) {
+                        goto done;
+                }
                 status = rpccli_spoolss_GetPrinterDataEx(cli, mem_ctx,
                                                          &pol,
                                                          keyname,
                                                          valuename,
+                                                         &type,
+                                                         data,
                                                          offered,
-                                                         &type,
-                                                         &data,
                                                          &needed,
                                                          &result);
@@ -930 +950 @@
         /* Display printer data */
 
-        display_printer_data(valuename, type, &data);
+        display_printer_data(valuename, type, data, needed);
 
 
@@ -2369 +2389 @@
         enum winreg_Type type;
         union spoolss_PrinterData data;
+        DATA_BLOB blob;
 
         /* parse the command arguments */
@@ -2471 +2492 @@
         }
 
+        result = push_spoolss_PrinterData(mem_ctx, &blob, type, &data);
+        if (!W_ERROR_IS_OK(result)) {
+                goto done;
+        }
+
         status = rpccli_spoolss_SetPrinterData(cli, mem_ctx,
                                                &pol,
                                                argv[3], /* value_name */
                                                type,
-                                               data,
-                                               0, /* autocalculated size */
+                                               blob.data,
+                                               blob.length,
                                                &result);
         if (!W_ERROR_IS_OK(result)) {
@@ -2883 +2909 @@
                 display_printer_data(info[i].value_name,
                                      info[i].type,
-                                     info[i].data);
+                                     info[i].data->data,
+                                     info[i].data->length);
         }