summaryrefslogtreecommitdiff
path: root/source3/rpcclient
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-01-16 01:15:49 +0100
committerDavid Disseldorp <ddiss@samba.org>2013-01-17 17:11:37 +0100
commit8304fe73f69ea7de57bd2d331038c4664553a9bd (patch)
treecad9cb9aa73651190673f499d9342a7f5212759a /source3/rpcclient
parentbe8c81bfa3c6a2727eab589a71c6215ca76e3d3a (diff)
downloadsamba-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/rpcclient')
-rw-r--r--source3/rpcclient/cmd_spoolss.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 969b747f4c..4e5da2a3ae 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -2104,7 +2104,7 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
WERROR werror;
NTSTATUS status;
const char *printername;
- union spoolss_AddFormInfo info;
+ struct spoolss_AddFormInfoCtr info_ctr;
struct spoolss_AddFormInfo1 info1;
struct spoolss_AddFormInfo2 info2;
uint32_t level = 1;
@@ -2145,7 +2145,8 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
info1.area.right = 20;
info1.area.bottom = 30;
- info.info1 = &info1;
+ info_ctr.level = 1;
+ info_ctr.info.info1 = &info1;
break;
case 2:
@@ -2164,7 +2165,8 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
info2.display_name = argv[2];
info2.lang_id = 0;
- info.info2 = &info2;
+ info_ctr.level = 2;
+ info_ctr.info.info2 = &info2;
break;
default:
@@ -2174,11 +2176,9 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
/* Add the form */
-
status = dcerpc_spoolss_AddForm(b, mem_ctx,
&handle,
- level,
- info,
+ &info_ctr,
&werror);
if (!NT_STATUS_IS_OK(status)) {
werror = ntstatus_to_werror(status);