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

Guenther

diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index 453908546d9b4a15c2bd85e1e13f713845033471..f57571f0e12ee9a3b49bc32ae1cc72d68ec9e013 100644 (file)
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -1267,9 +1267,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 0f16320a8cc7d334b54c20772bc67a124cda0827..25c160135b04dcf804d36a1775910c76ab6e055e 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -4114,9 +4114,9 @@ static NTSTATUS dcesrv_samr_QueryDisplayInfo3(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 b3002c9ab33fa2f1981d1c98d5d1a0c7f1eff8f0..0858b489448336b6f10df1e5e777f0e6714774d3 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -3832,6 +3832,9 @@ static bool test_QueryDisplayInfo3(struct dcerpc_pipe *p, struct torture_context
        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++) {
                torture_comment(tctx, "Testing QueryDisplayInfo3 level %u\n", levels[i]);
@@ -3841,6 +3844,9 @@ static bool test_QueryDisplayInfo3(struct dcerpc_pipe *p, struct torture_context
                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_QueryDisplayInfo3(p, tctx, &r);
                if (!NT_STATUS_IS_OK(status)) {