sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

winbind.idl: rename wbint_TransID.type to wbint_TransID.type_hint

Browse Source 
This makes it clear that it's a hint from the parent to the
child.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14539

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Stefan Metzmacher 2020-09-15 16:01:04 +02:00 committed by Andrew Bartlett
parent 302098c325
commit 1576421dbd
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librpc/idl/winbind.idl
View File

@ -40,7 +40,7 @@ interface winbind
);
typedef struct {
id_type type;
id_type type_hint;
uint32 domain_index;
uint32 rid;
unixid xid;

5
source3/winbindd/wb_sids2xids.c
View File

@ -222,7 +222,7 @@ static void wb_sids2xids_lookupsids_done(struct tevent_req *subreq)
sid_copy(&dom_sid, sid);
sid_split_rid(&dom_sid, &t->rid);
t->type = lsa_SidType_to_id_type(n->sid_type);
t->type_hint = lsa_SidType_to_id_type(n->sid_type);
domain_index = init_lsa_ref_domain_list(
state, &state->idmap_doms, domain_name, &dom_sid);
if (domain_index == -1) {
@ -232,7 +232,7 @@ static void wb_sids2xids_lookupsids_done(struct tevent_req *subreq)
t->domain_index = domain_index;
t->xid.id = UINT32_MAX;
t->xid.type = t->type;
t->xid.type = ID_TYPE_NOT_SPECIFIED;
}
TALLOC_FREE(names);
@ -337,7 +337,6 @@ static void wb_sids2xids_done(struct tevent_req *subreq)
for (i=0; i<dst->num_ids; i++) {
if (dst->ids[i].domain_index == state->dom_index) {
dst->ids[i].type = src->ids[src_idx].type;
dst->ids[i].xid = src->ids[src_idx].xid;
src_idx += 1;
}

2
source3/winbindd/winbindd_dual_srv.c
View File

@ -200,7 +200,7 @@ NTSTATUS _wbint_Sids2UnixIDs(struct pipes_struct *p,
sid_compose(m->sid, d->sid, ids[i].rid);
m->status = ID_UNKNOWN;
m->xid = (struct unixid) { .type = ids[i].type };
m->xid = (struct unixid) { .type = ids[i].type_hint };
}
status = dom->methods->sids_to_unixids(dom, id_map_ptrs);