summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-11-17 13:04:41 +0100
committerStefan Metzmacher <metze@samba.org>2012-12-03 08:48:21 +0100
commit7637c93472492f1bfd7bf46b8f855ef4818c75a9 (patch)
treebb70f690fc9ad7c369b2676b7a9dd95bd6ec07d0
parent8e5ce1e2d53f36fd35eb8efad7da680dcf0b1ce1 (diff)
downloadsamba-7637c93472492f1bfd7bf46b8f855ef4818c75a9.tar.gz
samba-7637c93472492f1bfd7bf46b8f855ef4818c75a9.tar.bz2
samba-7637c93472492f1bfd7bf46b8f855ef4818c75a9.zip
s3:winbindd: use wb_sids2xids instead of wb_sid2uid in winbindd_sid_to_uid
The main purpose of the change is to hand the sid into the idmap backend and handle responsiblity for handling the sid-type correctly to the idmap backend instead of failing directly when the sid is not of type user. Hence backends like rid who are sid-type agnostic, can return uids also for sids of other types. This is an important fix to make sid_to_uid behave the consistently with and without the presence of cache entries. We need to additionally filter the result for id type UID or more general (BOTH) to keep the behaviour. This is a step towards using only one codepath to id_mapping. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/winbindd/winbindd_sid_to_uid.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_sid_to_uid.c b/source3/winbindd/winbindd_sid_to_uid.c
index 9ce564f02e..67fe9527dc 100644
--- a/source3/winbindd/winbindd_sid_to_uid.c
+++ b/source3/winbindd/winbindd_sid_to_uid.c
@@ -54,7 +54,7 @@ struct tevent_req *winbindd_sid_to_uid_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev);
}
- subreq = wb_sid2uid_send(state, ev, &state->sid);
+ subreq = wb_sids2xids_send(state, ev, &state->sid, 1);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
@@ -69,12 +69,26 @@ static void winbindd_sid_to_uid_done(struct tevent_req *subreq)
struct winbindd_sid_to_uid_state *state = tevent_req_data(
req, struct winbindd_sid_to_uid_state);
NTSTATUS status;
+ struct unixid xid;
- status = wb_sid2uid_recv(subreq, &state->uid);
+ status = wb_sids2xids_recv(subreq, &xid);
TALLOC_FREE(subreq);
if (tevent_req_nterror(req, status)) {
return;
}
+
+ /*
+ * We are filtering further down in sids2xids, but that filtering
+ * depends on the actual type of the sid handed in (as determined
+ * by lookupsids). Here we need to filter for the type of object
+ * actually requested, in this case uid.
+ */
+ if (!(xid.type == ID_TYPE_UID || xid.type == ID_TYPE_BOTH)) {
+ tevent_req_nterror(req, NT_STATUS_NONE_MAPPED);
+ return;
+ }
+
+ state->uid = (uid_t)xid.id;
tevent_req_done(req);
}