diff options
| author | Günther Deschner <gd@samba.org> | 2008-11-05 11:17:22 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-11-10 21:46:29 +0100 |
| commit | 3a9b42fa7545b9b3e312c92d0b070892c4e1dc2e (patch) | |
| tree | 1014c0132770f2555c0c78187e3933898b80b27d | |
| parent | bab255f09b1f20a4bbb0ec6806af4551a187b4a1 (diff) | |
| download | samba-3a9b42fa7545b9b3e312c92d0b070892c4e1dc2e.tar.gz samba-3a9b42fa7545b9b3e312c92d0b070892c4e1dc2e.tar.bz2 samba-3a9b42fa7545b9b3e312c92d0b070892c4e1dc2e.zip | |
s4-samr: merge samr_QueryDisplayInfo2 from s3 idl. (fixme: python)
Guenther
| -rw-r--r-- | librpc/idl/samr.idl | 6 | ||||
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 6 | ||||
| -rw-r--r-- | source4/torture/rpc/samr.c | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl index f57571f0e1..aa72c546a8 100644 --- a/librpc/idl/samr.idl +++ b/librpc/idl/samr.idl @@ -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 ); /************************/ diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 25c160135b..b81559bfcf 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -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; } diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 0858b48944..8444ac3820 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -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)) { |