diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/netapi/group.c | 6 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 6 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_samr.c | 4 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_msrpc.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_rpc.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c index 9b9d8f0855..bf8d1667d6 100644 --- a/source3/lib/netapi/group.c +++ b/source3/lib/netapi/group.c @@ -234,7 +234,7 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx, struct samr_Ids rids; struct samr_Ids types; union samr_GroupInfo *info = NULL; - struct samr_RidTypeArray *rid_array = NULL; + struct samr_RidAttrArray *rid_array = NULL; ZERO_STRUCT(connect_handle); ZERO_STRUCT(domain_handle); @@ -1260,7 +1260,7 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx, struct lsa_String lsa_account_name; struct dom_sid2 *domain_sid = NULL; struct samr_Ids group_rids, name_types; - struct samr_RidTypeArray *rid_array = NULL; + struct samr_RidAttrArray *rid_array = NULL; struct lsa_Strings names; struct samr_Ids member_types; @@ -1408,7 +1408,7 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx, union samr_GroupInfo *group_info = NULL; struct samr_Ids user_rids, name_types; struct samr_Ids group_rids, group_types; - struct samr_RidTypeArray *rid_array = NULL; + struct samr_RidAttrArray *rid_array = NULL; struct lsa_String *lsa_names = NULL; uint32_t *add_rids = NULL; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 1a94a1ed8f..c8c5572b57 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -5500,7 +5500,7 @@ NTSTATUS _samr_QueryGroupMember(struct pipes_struct *p, uint32 *attr=NULL; NTSTATUS status; - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; ginfo = policy_handle_find(p, r->in.group_handle, SAMR_GROUP_ACCESS_GET_MEMBERS, NULL, @@ -5509,7 +5509,7 @@ NTSTATUS _samr_QueryGroupMember(struct pipes_struct *p, return status; } - rids = TALLOC_ZERO_P(p->mem_ctx, struct samr_RidTypeArray); + rids = TALLOC_ZERO_P(p->mem_ctx, struct samr_RidAttrArray); if (!rids) { return NT_STATUS_NO_MEMORY; } @@ -5548,7 +5548,7 @@ NTSTATUS _samr_QueryGroupMember(struct pipes_struct *p, } rids->count = num_members; - rids->types = attr; + rids->attributes = attr; rids->rids = rid; *r->out.rids = rids; diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 17314d23e9..7730e65c12 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -722,7 +722,7 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli, uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; int i; unsigned int old_timeout; - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; if ((argc < 2) || (argc > 3)) { printf("Usage: %s rid [access mask]\n", argv[0]); @@ -774,7 +774,7 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli, for (i = 0; i < rids->count; i++) { printf("\trid:[0x%x] attr:[0x%x]\n", rids->rids[i], - rids->types[i]); + rids->attributes[i]); } rpccli_samr_Close(cli, mem_ctx, &group_pol); diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 96b3626391..7c49645cfc 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1511,7 +1511,7 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c, bool group_is_primary = false; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; uint32_t group_rid; - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; /* char **names; */ int i; /* struct samr_RidWithAttribute *user_gids; */ @@ -2512,7 +2512,7 @@ static NTSTATUS rpc_list_group_members(struct net_context *c, struct policy_handle group_pol; uint32 num_members, *group_rids; int i; - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; struct lsa_Strings names; struct samr_Ids types; diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c index 4bfede5ea0..500c279ff3 100644 --- a/source3/winbindd/winbindd_msrpc.c +++ b/source3/winbindd/winbindd_msrpc.c @@ -618,7 +618,7 @@ static NTSTATUS msrpc_lookup_groupmem(struct winbindd_domain *domain, unsigned int j, r; struct rpc_pipe_client *cli; unsigned int orig_timeout; - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; DEBUG(3,("msrpc_lookup_groupmem: %s sid=%s\n", domain->name, sid_string_dbg(group_sid))); diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 3ceaa67b7e..0a643f5644 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -693,7 +693,7 @@ NTSTATUS rpc_lookup_groupmem(TALLOC_CTX *mem_ctx, switch(type) { case SID_NAME_DOM_GRP: { - struct samr_RidTypeArray *rids = NULL; + struct samr_RidAttrArray *rids = NULL; status = rpccli_samr_OpenGroup(samr_pipe, mem_ctx, |