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

Guenther

diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index d3dd13d27069514a35c1a163892824b2f61bafa2..1021dd32e25f2a5d18c49fb453fad0680ea07564 100644 (file)
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -632,7 +632,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 
        NTSTATUS samr_QueryGroupMember(
                [in,ref]  policy_handle *group_handle,
-               [out,unique] samr_RidTypeArray *rids
+               [out,ref] samr_RidTypeArray **rids
                );
 
 

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 552a1b5e3edf48ca20db543cf47b52f299e25d50..1511d78243aa4ea735beb2eaa7a241c1a6c5547f 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -2481,7 +2481,7 @@ static NTSTATUS dcesrv_samr_QueryGroupMember(struct dcesrv_call_state *dce_call,
                }
        }
 
-       r->out.rids = array;
+       *r->out.rids = array;
 
        return NT_STATUS_OK;
 }

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 259a19d0b97911aa4790c3636ec79e8282247639..13ab01a0c73b88e81c6b00e96b4ab77f785626a9 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2978,11 +2978,13 @@ static bool test_QueryGroupMember(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
        NTSTATUS status;
        struct samr_QueryGroupMember r;
+       struct samr_RidTypeArray *rids = NULL;
        bool ret = true;
 
        printf("Testing QueryGroupMember\n");
 
        r.in.group_handle = handle;
+       r.out.rids = &rids;
 
        status = dcerpc_samr_QueryGroupMember(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -4226,6 +4228,7 @@ static bool test_AddGroupMember(struct dcerpc_pipe *p, struct torture_context *t
        struct samr_AddGroupMember r;
        struct samr_DeleteGroupMember d;
        struct samr_QueryGroupMember q;
+       struct samr_RidTypeArray *rids = NULL;
        struct samr_SetMemberAttributesOfGroup s;
        uint32_t rid;
 
@@ -4265,6 +4268,7 @@ static bool test_AddGroupMember(struct dcerpc_pipe *p, struct torture_context *t
        }
 
        q.in.group_handle = group_handle;
+       q.out.rids = &rids;
 
        status = dcerpc_samr_QueryGroupMember(p, tctx, &q);
        torture_assert_ntstatus_ok(tctx, status, "QueryGroupMember");