diff options
| author | Günther Deschner <gd@samba.org> | 2013-01-16 01:15:49 +0100 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2013-01-17 17:11:37 +0100 |
| commit | 8304fe73f69ea7de57bd2d331038c4664553a9bd (patch) | |
| tree | cad9cb9aa73651190673f499d9342a7f5212759a /source3/utils | |
| parent | be8c81bfa3c6a2727eab589a71c6215ca76e3d3a (diff) | |
| download | samba-8304fe73f69ea7de57bd2d331038c4664553a9bd.tar.gz samba-8304fe73f69ea7de57bd2d331038c4664553a9bd.tar.bz2 samba-8304fe73f69ea7de57bd2d331038c4664553a9bd.zip | |
spoolss: make spoolss deal with ndr64 AddForm by using proper container object.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 4fbe14f294..9743d08e0c 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -1789,7 +1789,7 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, for (f = 0; f < num_forms; f++) { - union spoolss_AddFormInfo info; + struct spoolss_AddFormInfoCtr info_ctr; NTSTATUS status; /* only migrate FORM_PRINTER types, according to jerry @@ -1802,16 +1802,15 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, "[%d]\n"), f, forms[f].info1.form_name, forms[f].info1.flags); - - info.info1 = (struct spoolss_AddFormInfo1 *) + info_ctr.level = 1; + info_ctr.info.info1 = (struct spoolss_AddFormInfo1 *) (void *)&forms[f].info1; /* FIXME: there might be something wrong with samba's builtin-forms */ status = dcerpc_spoolss_AddForm(b_dst, mem_ctx, &hnd_dst, - 1, - info, + &info_ctr, &result); if (!NT_STATUS_IS_OK(status)) { d_printf(_("\tdcerpc_spoolss_AddForm form %d: [%s] - %s\n"), |