diff options
| author | Volker Lendecke <vl@samba.org> | 2009-08-23 12:43:43 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-08-29 10:44:13 +0200 |
| commit | 58feaa794791fd33fdb44686c6296e6bbfa8e7a1 (patch) | |
| tree | 7a46b78d19a9bc2d7b09351a8a7c048677cc8df6 /source3/winbindd | |
| parent | ffd9d41be93984b6a139818184716e709fbfa1ef (diff) | |
| download | samba-58feaa794791fd33fdb44686c6296e6bbfa8e7a1.tar.gz samba-58feaa794791fd33fdb44686c6296e6bbfa8e7a1.tar.bz2 samba-58feaa794791fd33fdb44686c6296e6bbfa8e7a1.zip | |
s3:winbind: Rename wbint_GroupMembers to wbint_Principals
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/wb_group_members.c | 6 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_dual_srv.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c index 57c3707b5d..705051d05a 100644 --- a/source3/winbindd/wb_group_members.c +++ b/source3/winbindd/wb_group_members.c @@ -39,7 +39,7 @@ struct wb_lookupgroupmem_state { struct dom_sid sid; - struct wbint_GroupMembers members; + struct wbint_Principals members; }; static void wb_lookupgroupmem_done(struct tevent_req *subreq); @@ -110,8 +110,8 @@ static NTSTATUS wb_lookupgroupmem_recv(struct tevent_req *req, return status; } - *num_members = state->members.num_members; - *members = talloc_move(mem_ctx, &state->members.members); + *num_members = state->members.num_principals; + *members = talloc_move(mem_ctx, &state->members.principals); return NT_STATUS_OK; } diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index f0c9690837..01860ebf6f 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -179,17 +179,17 @@ NTSTATUS _wbint_LookupGroupMembers(pipes_struct *p, return status; } - r->out.members->num_members = num_names; - r->out.members->members = talloc_array( + r->out.members->num_principals = num_names; + r->out.members->principals = talloc_array( r->out.members, struct wbint_Principal, num_names); - if (r->out.members->members == NULL) { + if (r->out.members->principals == NULL) { return NT_STATUS_NO_MEMORY; } for (i=0; i<num_names; i++) { - struct wbint_Principal *m = &r->out.members->members[i]; + struct wbint_Principal *m = &r->out.members->principals[i]; sid_copy(&m->sid, &sid_mem[i]); - m->name = talloc_move(r->out.members->members, &names[i]); + m->name = talloc_move(r->out.members->principals, &names[i]); m->type = (enum lsa_SidType)name_types[i]; } |