sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

spoolss: make spoolss deal with ndr64 SetForm by using proper container object.

Browse Source 
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Günther Deschner 2013-01-16 13:41:28 +01:00 committed by David Disseldorp
parent 8304fe73f6
commit 3b94b64481
5 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
librpc/idl/spoolss.idl
View File

@ -2072,8 +2072,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
WERROR spoolss_SetForm(
[in,ref] policy_handle *handle,
[in] [string,charset(UTF16)] uint16 form_name[],
[in] uint32 level,
[in,switch_is(level)] spoolss_AddFormInfo info
[in,ref] spoolss_AddFormInfoCtr *info_ctr
);
/******************/

11
source3/rpc_server/spoolss/srv_spoolss_nt.c
View File

@ -8799,7 +8799,7 @@ done:
WERROR _spoolss_SetForm(struct pipes_struct *p,
struct spoolss_SetForm *r)
{
struct spoolss_AddFormInfo1 *form = r->in.info.info1;
struct spoolss_AddFormInfo1 *form;
const char *form_name = r->in.form_name;
int snum = -1;
WERROR status = WERR_OK;
@ -8826,6 +8826,15 @@ WERROR _spoolss_SetForm(struct pipes_struct *p,
return WERR_ACCESS_DENIED;
}
if (r->in.info_ctr->level != 1) {
return WERR_INVALID_LEVEL;
}
form = r->in.info_ctr->info.info1;
if (!form) {
return WERR_INVALID_PARAM;
}
tmp_ctx = talloc_new(p->mem_ctx);
if (!tmp_ctx) {
return WERR_NOMEM;

8
source3/rpcclient/cmd_spoolss.c
View File

@ -2203,7 +2203,7 @@ static WERROR cmd_spoolss_setform(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 dcerpc_binding_handle *b = cli->binding_handle;
@ -2236,15 +2236,15 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
info1.area.bottom = 3000;
info1.form_name = argv[2];
info.info1 = &info1;
info_ctr.info.info1 = &info1;
info_ctr.level = 1;
/* Set the form */
status = dcerpc_spoolss_SetForm(b, mem_ctx,
&handle,
argv[2],
1,
info,
&info_ctr,
&werror);
if (!NT_STATUS_IS_OK(status)) {
werror = ntstatus_to_werror(status);

22
source4/ntptr/simple_ldb/ntptr_simple_ldb.c
View File

@ -383,16 +383,16 @@ static WERROR sptr_SetPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
* }
*/
switch (r->in.level) {
switch (r->in.info_ctr->level) {
case 1:
if (!r->in.info.info1) {
if (!r->in.info_ctr->info.info1) {
return WERR_FOOBAR;
}
count = sptr_db_search(sptr_db, mem_ctx,
ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
&msgs, attrs, "(&(form-name=%s)(objectClass=form))",
r->in.info.info1->form_name);
r->in.info_ctr->info.info1->form_name);
if (count == 0) return WERR_FOOBAR;
if (count > 1) return WERR_FOOBAR;
@ -409,17 +409,17 @@ static WERROR sptr_SetPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
/* add core elements to the ldb_message for the user */
msg->dn = msgs[0]->dn;
SET_UINT(sptr_db, msg, "flags", r->in.info.info1->flags);
SET_UINT(sptr_db, msg, "flags", r->in.info_ctr->info.info1->flags);
SET_STRING(sptr_db, msg, "form-name", r->in.info.info1->form_name);
SET_STRING(sptr_db, msg, "form-name", r->in.info_ctr->info.info1->form_name);
SET_UINT(sptr_db, msg, "size-width", r->in.info.info1->size.width);
SET_UINT(sptr_db, msg, "size-height", r->in.info.info1->size.height);
SET_UINT(sptr_db, msg, "size-width", r->in.info_ctr->info.info1->size.width);
SET_UINT(sptr_db, msg, "size-height", r->in.info_ctr->info.info1->size.height);
SET_UINT(sptr_db, msg, "area-left", r->in.info.info1->area.left);
SET_UINT(sptr_db, msg, "area-top", r->in.info.info1->area.top);
SET_UINT(sptr_db, msg, "area-right", r->in.info.info1->area.right);
SET_UINT(sptr_db, msg, "area-bottom", r->in.info.info1->area.bottom);
SET_UINT(sptr_db, msg, "area-left", r->in.info_ctr->info.info1->area.left);
SET_UINT(sptr_db, msg, "area-top", r->in.info_ctr->info.info1->area.top);
SET_UINT(sptr_db, msg, "area-right", r->in.info_ctr->info.info1->area.right);
SET_UINT(sptr_db, msg, "area-bottom", r->in.info_ctr->info.info1->area.bottom);
break;
default:
return WERR_UNKNOWN_LEVEL;

9
source4/torture/rpc/spoolss.c
View File

@ -2713,14 +2713,17 @@ static bool test_SetForm(struct torture_context *tctx,
union spoolss_AddFormInfo *info)
{
struct spoolss_SetForm r;
struct spoolss_AddFormInfoCtr info_ctr;
info_ctr.level = level;
info_ctr.info = *info;
r.in.handle = handle;
r.in.form_name = form_name;
r.in.level = level;
r.in.info = *info;
r.in.info_ctr = &info_ctr;
torture_comment(tctx, "Testing SetForm(%s) level %d\n",
form_name, r.in.level);
form_name, level);
torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetForm_r(b, tctx, &r),
"SetForm failed");