diff options
| author | Günther Deschner <gd@samba.org> | 2010-03-04 17:58:49 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-03-05 15:18:01 +0100 |
| commit | 8e6dd25391d77b69859a3b622a1b116fa8000a40 (patch) | |
| tree | 1fcacd6c78e9b5ac62bb5faa9873a5346605fd7e | |
| parent | 55326549852a3ab1114a8cb1536578ae02183eb8 (diff) | |
| download | samba-8e6dd25391d77b69859a3b622a1b116fa8000a40.tar.gz samba-8e6dd25391d77b69859a3b622a1b116fa8000a40.tar.bz2 samba-8e6dd25391d77b69859a3b622a1b116fa8000a40.zip | |
s3-libads: fix get_remote_printer_publishing_data after spoolss_EnumPrinterDataEx IDL change.
Guenther
| -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 b5a3e6ba43..d5290b23a9 100644 --- a/source3/libads/ldap_printer.c +++ b/source3/libads/ldap_printer.c @@ -346,19 +346,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++) { 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); } } @@ -373,19 +367,13 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli, } else { 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); } } |