diff options
| author | Günther Deschner <gd@samba.org> | 2010-03-04 17:58:49 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-06 14:08:32 +0200 |
| commit | 6b2eae53d2d411b8cc504ac34280f77f5acf57d4 (patch) | |
| tree | 3166b452a15cbbce904e9245d4e5fbbd9b44daee /source3/libads/ldap_printer.c | |
| parent | eab0e37fe0a3df20fcc258b64beed842fa294602 (diff) | |
| download | samba-6b2eae53d2d411b8cc504ac34280f77f5acf57d4.tar.gz | |
s3-libads: fix get_remote_printer_publishing_data after spoolss_EnumPrinterDataEx IDL change.
Guenther
(cherry picked from commit 9d5aa986357983fb6a422c0990a3f134e44874d5)
Diffstat (limited to 'source3/libads/ldap_printer.c')
| -rw-r--r-- | source3/libads/ldap_printer.c | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c index 7fec58c7ebc..13be6a65c16 100644 --- a/source3/libads/ldap_printer.c +++ b/source3/libads/ldap_printer.c @@ -345,19 +345,13 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli, /* Have the data we need now, so start building */ for (i=0; i < count; i++) { REGISTRY_VALUE 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); } } @@ -372,19 +366,13 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli, } else { for (i=0; i < count; i++) { REGISTRY_VALUE 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); } } |