sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s4-samr: merge samr_QueryDisplayInfo2 from s3 idl. (fixme: python)

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-11-05 11:17:22 +01:00
parent bab255f09b
commit 3a9b42fa75
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
librpc/idl/samr.idl
View File

@ -1223,9 +1223,9 @@ import "misc.idl", "lsa.idl", "security.idl";
[in] uint32 start_idx,
[in] uint32 max_entries,
[in] uint32 buf_size,
[out] uint32 total_size,
[out] uint32 returned_size,
[out,switch_is(level)] samr_DispInfo info
[out,ref] uint32 *total_size,
[out,ref] uint32 *returned_size,
[out,ref,switch_is(level)] samr_DispInfo *info
);
/************************/

6
source4/rpc_server/samr/dcesrv_samr.c
View File

@ -4078,9 +4078,9 @@ static NTSTATUS dcesrv_samr_QueryDisplayInfo2(struct dcesrv_call_state *dce_call
result = dcesrv_samr_QueryDisplayInfo(dce_call, mem_ctx, &q);
r->out.total_size = q.out.total_size;
r->out.returned_size = q.out.returned_size;
r->out.info = q.out.info;
*r->out.total_size = q.out.total_size;
*r->out.returned_size = q.out.returned_size;
*r->out.info = q.out.info;
return result;
}

6
source4/torture/rpc/samr.c
View File

@ -3803,6 +3803,9 @@ static bool test_QueryDisplayInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
bool ret = true;
uint16_t levels[] = {1, 2, 3, 4, 5};
int i;
uint32_t total_size;
uint32_t returned_size;
union samr_DispInfo info;
for (i=0;i<ARRAY_SIZE(levels);i++) {
printf("Testing QueryDisplayInfo2 level %u\n", levels[i]);
@ -3812,6 +3815,9 @@ static bool test_QueryDisplayInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
r.in.start_idx = 0;
r.in.max_entries = 1000;
r.in.buf_size = (uint32_t)-1;
r.out.total_size = &total_size;
r.out.returned_size = &returned_size;
r.out.info = &info;
status = dcerpc_samr_QueryDisplayInfo2(p, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {