diff options
| author | Günther Deschner <gd@samba.org> | 2008-11-05 02:00:12 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-11-10 21:46:28 +0100 |
| commit | 9774927947039e3819827c52fc078cca3a323e6d (patch) | |
| tree | 9ca0e417f8fa5834b0dbe7e40cb0c1e59a80162d | |
| parent | a2a26da89981792ae0141d02ae40e598163c6b4d (diff) | |
| download | samba-9774927947039e3819827c52fc078cca3a323e6d.tar.gz samba-9774927947039e3819827c52fc078cca3a323e6d.tar.bz2 samba-9774927947039e3819827c52fc078cca3a323e6d.zip | |
s4-samr: merge samr_QueryGroupMember from s3 idl. (fixme: python)
Guenther
| -rw-r--r-- | librpc/idl/samr.idl | 2 | ||||
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/samr.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl index d3dd13d270..1021dd32e2 100644 --- 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 552a1b5e3e..1511d78243 100644 --- 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 259a19d0b9..13ab01a0c7 100644 --- 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"); |