diff options
| author | Günther Deschner <gd@samba.org> | 2009-02-08 00:03:00 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-02-09 10:42:04 +0100 |
| commit | 5234f5e433847e6efd29e0c4a7d76a491818a92a (patch) | |
| tree | 0c367b02a74220657957ecae00e5e96618d11a97 /source3/utils | |
| parent | 45f142fe29059accad5ff408e844ad3ae29e3b96 (diff) | |
| download | samba-5234f5e433847e6efd29e0c4a7d76a491818a92a.tar.gz samba-5234f5e433847e6efd29e0c4a7d76a491818a92a.tar.bz2 samba-5234f5e433847e6efd29e0c4a7d76a491818a92a.zip | |
s3-spoolss: use rpccli_spoolss_AddForm in net and rpcclient.
Guenther
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 60e823e5e0..ad9be05798 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -1668,8 +1668,10 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, for (f = 0; f < num_forms; f++) { - FORM form; + union spoolss_AddFormInfo info; + struct spoolss_AddFormInfo1 info1; fstring form_name; + NTSTATUS status; /* only migrate FORM_PRINTER types, according to jerry FORM_BUILTIN-types are hard-coded in samba */ @@ -1685,20 +1687,24 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, f, form_name, forms[f].flag); /* is there a more elegant way to do that ? */ - form.flags = FORM_PRINTER; - form.size_x = forms[f].width; - form.size_y = forms[f].length; - form.left = forms[f].left; - form.top = forms[f].top; - form.right = forms[f].right; - form.bottom = forms[f].bottom; + info1.flags = FORM_PRINTER; + info1.size.width = forms[f].width; + info1.size.height = forms[f].length; + info1.area.left = forms[f].left; + info1.area.top = forms[f].top; + info1.area.right = forms[f].right; + info1.area.bottom = forms[f].bottom; + info1.form_name = form_name; - init_unistr2(&form.name, form_name, UNI_STR_TERMINATE); + info.info1 = &info1; /* FIXME: there might be something wrong with samba's builtin-forms */ - result = rpccli_spoolss_addform(pipe_hnd_dst, mem_ctx, - &hnd_dst, 1, &form); + status = rpccli_spoolss_AddForm(pipe_hnd_dst, mem_ctx, + &hnd_dst, + 1, + info, + &result); if (!W_ERROR_IS_OK(result)) { d_printf("\tAddForm form %d: [%s] refused.\n", f, form_name); |