Changeset 429 for trunk/server/source3/libads/ldap_printer.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/libads/ldap_printer.c (modified) (2 diffs)

trunk/server/source3/libads/ldap_printer.c

@@ -347 +347 @@
                 for (i=0; i < count; i++) {
                         struct regval_blob v;
-                        DATA_BLOB blob;
-
-                        result = push_spoolss_PrinterData(mem_ctx, &blob,
-                                                          info[i].type,
-                                                          info[i].data);
-                        if (W_ERROR_IS_OK(result)) {
-                                fstrcpy(v.valuename, info[i].value_name);
-                                v.type = info[i].type;
-                                v.data_p = blob.data;
-                                v.size = blob.length;
-
-                                map_regval_to_ads(mem_ctx, mods, &v);
-                        }
+
+                        fstrcpy(v.valuename, info[i].value_name);
+                        v.type = info[i].type;
+                        v.data_p = info[i].data->data;
+                        v.size = info[i].data->length;
+
+                        map_regval_to_ads(mem_ctx, mods, &v);
                 }
         }
@@ -374 +368 @@
                 for (i=0; i < count; i++) {
                         struct regval_blob v;
-                        DATA_BLOB blob = data_blob_null;
-
-                        result = push_spoolss_PrinterData(mem_ctx, &blob,
-                                                          info[i].type,
-                                                          info[i].data);
-                        if (W_ERROR_IS_OK(result)) {
-                                fstrcpy(v.valuename, info[i].value_name);
-                                v.type = info[i].type;
-                                v.data_p = blob.data;
-                                v.size = blob.length;
-
-                                map_regval_to_ads(mem_ctx, mods, &v);
-                        }
+
+                        fstrcpy(v.valuename, info[i].value_name);
+                        v.type = info[i].type;
+                        v.data_p = info[i].data->data;
+                        v.size = info[i].data->length;
+
+                        map_regval_to_ads(mem_ctx, mods, &v);
                 }
         }