summaryrefslogtreecommitdiff
path: root/source3/passdb/lookup_sid.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-23 21:11:33 +1100
committerMichael Adam <obnox@samba.org>2012-05-02 13:18:03 +0200
commitc844f657793c0f8df3b2afcf710166b628e8233b (patch)
tree52d0e4bd4fb6066dd84e789c9c1ef66cf1a7b4ae /source3/passdb/lookup_sid.c
parent583b104d4b9a6ae65e4b43afaba665398a34c72f (diff)
downloadsamba-c844f657793c0f8df3b2afcf710166b628e8233b.tar.gz
samba-c844f657793c0f8df3b2afcf710166b628e8233b.tar.bz2
samba-c844f657793c0f8df3b2afcf710166b628e8233b.zip
s3-idmap: convert most idmap_cache callers to unixid API
This will eventually allow the struct unixid to be passed all the way up and down the stack. Andrew Bartlett Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/passdb/lookup_sid.c')
-rw-r--r--source3/passdb/lookup_sid.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index a72cbd0986..4ceba3cdd2 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1284,16 +1284,9 @@ bool sids_to_unixids(const struct dom_sid *sids, uint32_t num_sids,
ids[i].id = rid;
continue;
}
- if (idmap_cache_find_sid2uid(&sids[i], &ids[i].id,
- &expired)
- && !expired) {
- ids[i].type = ID_TYPE_UID;
- continue;
- }
- if (idmap_cache_find_sid2gid(&sids[i], &ids[i].id,
- &expired)
- && !expired) {
- ids[i].type = ID_TYPE_GID;
+ if (idmap_cache_find_sid2unixid(&sids[i], &ids[i], &expired)
+ && !expired)
+ {
continue;
}
ids[i].type = ID_TYPE_NOT_SPECIFIED;