diff options
| author | Günther Deschner <gd@samba.org> | 2010-10-07 13:01:29 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-10-07 12:04:32 +0000 |
| commit | b7683a2c9d10e34e4d8eed8664ed4c14f71f981f (patch) | |
| tree | 1e02649d720f1d923b096f6f08a509806b2d3df6 /source4 | |
| parent | e0b340247a4f7f0b6506752add0af3df8deb9920 (diff) | |
| download | samba-b7683a2c9d10e34e4d8eed8664ed4c14f71f981f.tar.gz samba-b7683a2c9d10e34e4d8eed8664ed4c14f71f981f.tar.bz2 samba-b7683a2c9d10e34e4d8eed8664ed4c14f71f981f.zip | |
samr: for correctness, rename samr_RidTypeArray to samr_RidAttrArray.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Oct 7 12:04:32 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 14 | ||||
| -rw-r--r-- | source4/torture/rpc/samr.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/samr_accessmask.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index e9ed2efb86..3a73c7a6fe 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -2118,7 +2118,7 @@ static NTSTATUS dcesrv_samr_QueryGroupMember(struct dcesrv_call_state *dce_call, struct dcesrv_handle *h; struct samr_account_state *a_state; struct samr_domain_state *d_state; - struct samr_RidTypeArray *array; + struct samr_RidAttrArray *array; unsigned int i, num_members; struct dom_sid *members; NTSTATUS status; @@ -2135,7 +2135,7 @@ static NTSTATUS dcesrv_samr_QueryGroupMember(struct dcesrv_call_state *dce_call, return status; } - array = talloc_zero(mem_ctx, struct samr_RidTypeArray); + array = talloc_zero(mem_ctx, struct samr_RidAttrArray); if (array == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2151,8 +2151,8 @@ static NTSTATUS dcesrv_samr_QueryGroupMember(struct dcesrv_call_state *dce_call, return NT_STATUS_NO_MEMORY; } - array->types = talloc_array(array, uint32_t, num_members); - if (array->types == NULL) { + array->attributes = talloc_array(array, uint32_t, num_members); + if (array->attributes == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2168,9 +2168,9 @@ static NTSTATUS dcesrv_samr_QueryGroupMember(struct dcesrv_call_state *dce_call, return status; } - array->types[array->count] = SE_GROUP_MANDATORY | - SE_GROUP_ENABLED_BY_DEFAULT | - SE_GROUP_ENABLED; + array->attributes[array->count] = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED_BY_DEFAULT | + SE_GROUP_ENABLED; array->count++; } diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 7212f1eb7d..ad61692e03 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -5616,7 +5616,7 @@ static bool test_QueryGroupMember(struct dcerpc_binding_handle *b, struct policy_handle *handle) { struct samr_QueryGroupMember r; - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; bool ret = true; torture_comment(tctx, "Testing QueryGroupMember\n"); @@ -7010,7 +7010,7 @@ static bool test_AddGroupMember(struct dcerpc_binding_handle *b, struct samr_AddGroupMember r; struct samr_DeleteGroupMember d; struct samr_QueryGroupMember q; - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; struct samr_SetMemberAttributesOfGroup s; uint32_t rid; bool found_member = false; diff --git a/source4/torture/rpc/samr_accessmask.c b/source4/torture/rpc/samr_accessmask.c index 63f99f9005..e6f7b05a96 100644 --- a/source4/torture/rpc/samr_accessmask.c +++ b/source4/torture/rpc/samr_accessmask.c @@ -812,7 +812,7 @@ static bool test_samr_group(struct torture_context *tctx, } { struct samr_QueryGroupMember r; - struct samr_RidTypeArray *rids; + struct samr_RidAttrArray *rids; r.in.group_handle = &group_handle; r.out.rids = &rids; |