Changeset 429 for trunk/server/source3/utils/net_rpc_printer.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_rpc_printer.c (modified) (7 diffs)

trunk/server/source3/utils/net_rpc_printer.c

@@ -833 +833 @@
                                        const char *value_name,
                                        enum winreg_Type type,
-                                       union spoolss_PrinterData data)
+                                       uint8_t *data,
+                                       uint32_t offered)
 {
         WERROR result;
@@ -844 +845 @@
                                                type,
                                                data,
-                                               0, /* autocalculated */
+                                               
                                                &result);
 
@@ -911 +912 @@
         WERROR result;
         NTSTATUS status;
-        union spoolss_PrinterData data;
-        DATA_BLOB blob;
-
-        blob = data_blob_const(value->data_p, value->size);
-
-        result = pull_spoolss_PrinterData(mem_ctx, &blob, &data, value->type);
-        if (!W_ERROR_IS_OK(result)) {
-                return false;
-        }
 
         /* setprinterdataex call */
@@ -927 +919 @@
                                                  value->valuename,
                                                  value->type,
-                                                 data,
-                                                 0,
+                                                 ,
+                                                 ,
                                                  &result);
 
@@ -2360 +2352 @@
 
                                 struct regval_blob v;
-                                DATA_BLOB blob;
-                                union spoolss_PrinterData printer_data;
 
                                 /* display_value */
@@ -2372 +2362 @@
                                 }
 
-                                result = pull_spoolss_PrinterData(mem_ctx,
-                                                                  &blob,
-                                                                  &printer_data,
-                                                                  type);
-                                if (!W_ERROR_IS_OK(result)) {
-                                        goto done;
-                                }
-
                                 /* set_value */
                                 if (!net_spoolss_setprinterdata(pipe_hnd_dst, mem_ctx,
                                                                 &hnd_dst, value_name,
-                                                                type, printer_data))
+                                                                type, ))
                                         goto done;
 
@@ -2502 +2484 @@
                                         struct regval_blob v;
 
-                                        result = push_spoolss_PrinterData(mem_ctx, &blob,
-                                                                          info[j].type,
-                                                                          info[j].data);
-                                        if (!W_ERROR_IS_OK(result)) {
-                                                goto done;
-                                        }
-
                                         fstrcpy(v.valuename, info[j].value_name);
                                         v.type = info[j].type;
-                                        v.data_p = blob.data;
-                                        v.size = blob.length;
+                                        v.data_p = data;
+                                        v.size = length;
 
                                         if (c->opt_verbose) {