Changeset 427 for vendor/current/source3/rpc_server/srv_spoolss_nt.c

Timestamp:

Apr 9, 2010, 3:20:58 PM (16 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

File:

• vendor/current/source3/rpc_server/srv_spoolss_nt.c (modified) (12 diffs)

vendor/current/source3/rpc_server/srv_spoolss_nt.c

@@ -7697 +7697 @@
                                 goto done;
                         }
-                        *r->out.value_needed = strlen_m(regval_name(val));
+                        *r->out.value_needed = strlen_m;
                 } else {
                         r->out.value_name = NULL;
@@ -7742 +7742 @@
         r2.in.type              = r->in.type;
         r2.in.data              = r->in.data;
-        r2.in._offered          = r->in._offered;
+        r2.in.offered;
 
         return _spoolss_SetPrinterDataEx(p, &r2);
@@ -8590 +8590 @@
         if (Printer->printer_type == SPLHND_SERVER) {
 
+
+
                 result = getprinterdata_printer_server(p->mem_ctx,
                                                        r->in.value_name,
                                                        r->out.type,
-                                                       r->out.data);
-                goto done;
+                                                       &data);
+                if (!W_ERROR_IS_OK(result)) {
+                        goto done;
+                }
+
+                result = push_spoolss_PrinterData(p->mem_ctx, &blob,
+                                                  *r->out.type, &data);
+                if (!W_ERROR_IS_OK(result)) {
+                        goto done;
+                }
+
+                *r->out.needed = blob.length;
+
+                if (r->in.offered >= *r->out.needed) {
+                        memcpy(r->out.data, blob.data, blob.length);
+                }
+
+                return SPOOLSS_BUFFER_OK(WERR_OK, WERR_MORE_DATA);
         }
 
@@ -8619 +8637 @@
                 *r->out.type = REG_DWORD;
                 *r->out.needed = 4;
-                r->out.data->value = printer->info_2->changeid;
-                result = WERR_OK;
+                if (r->in.offered >= *r->out.needed) {
+                        SIVAL(r->out.data, 0, printer->info_2->changeid);
+                        result = WERR_OK;
+                }
                 goto done;
         }
@@ -8641 +8661 @@
         *r->out.type = regval_type(val);
 
-        blob = data_blob_const(regval_data_p(val), regval_size(val));
-
-        result = pull_spoolss_PrinterData(p->mem_ctx, &blob,
-                                          r->out.data,
-                                          *r->out.type);
-
+        if (r->in.offered >= *r->out.needed) {
+                memcpy(r->out.data, regval_data_p(val), regval_size(val));
+        }
  done:
         if (printer) {
@@ -8656 +8673 @@
         }
 
-        *r->out.needed  = ndr_size_spoolss_PrinterData(r->out.data, *r->out.type, NULL, 0);
         *r->out.type    = SPOOLSS_BUFFER_OK(*r->out.type, REG_NONE);
         r->out.data     = SPOOLSS_BUFFER_OK(r->out.data, r->out.data);
@@ -8675 +8691 @@
         Printer_entry           *Printer = find_printer_index_by_hnd(p, r->in.handle);
         char                    *oid_string;
-        DATA_BLOB blob;
 
         DEBUG(4,("_spoolss_SetPrinterDataEx\n"));
@@ -8725 +8740 @@
         }
 
-        result = push_spoolss_PrinterData(p->mem_ctx, &blob,
-                                          r->in.type, &r->in.data);
-        if (!W_ERROR_IS_OK(result)) {
-                goto done;
-        }
-
         /*
          * When client side code sets a magic printer data key, detect it and save
@@ -8738 +8747 @@
         if ((r->in.type == REG_BINARY) && strequal(r->in.value_name, PHANTOM_DEVMODE_KEY)) {
                 /* Set devmode and printer initialization info */
-                result = save_driver_init(printer, 2, blob.data, blob.length);
+                result = save_driver_init(printer, 2, );
 
                 srv_spoolss_reset_printerdata(printer->info_2->drivername);
@@ -8748 +8757 @@
 
         result = set_printer_dataex(printer, r->in.key_name, r->in.value_name,
-                                    r->in.type, blob.data, blob.length);
+                                    r->in.type, );
 
         if (W_ERROR_IS_OK(result)) {
@@ -8986 +8995 @@
                                                    struct spoolss_PrinterEnumValues *r)
 {
-        WERROR result;
-
-        r->data = TALLOC_ZERO_P(mem_ctx, union spoolss_PrinterData);
+        r->data = TALLOC_ZERO_P(mem_ctx, DATA_BLOB);
         W_ERROR_HAVE_NO_MEMORY(r->data);
 
@@ -8998 +9005 @@
 
         if (r->data_length) {
-                DATA_BLOB blob = data_blob_const(regval_data_p(v),
-                                                 regval_size(v));
-                result = pull_spoolss_PrinterData(mem_ctx, &blob,
-                                                  r->data,
-                                                  r->type);
-                if (!W_ERROR_IS_OK(result)) {
-                        return result;
-                }
+                *r->data = data_blob_talloc(r->data, regval_data_p(v), regval_size(v));
         }