X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fwinbindd%2Fidmap_rid.c;h=762d8890db582a4b211f4ee565f8ece383d08ad6;hb=60a283c88781658bcb56cd9193aad74c45fdd77d;hp=b09f2e9453b9727a006aff67095e487dc79b4fa3;hpb=49a6eae272cf16bd35805a009f705e2135e4840e;p=metze%2Fsamba%2Fwip.git

diff --git a/source3/winbindd/idmap_rid.c b/source3/winbindd/idmap_rid.c
index b09f2e9453b9..762d8890db58 100644
--- a/source3/winbindd/idmap_rid.c
+++ b/source3/winbindd/idmap_rid.c
@@ -140,18 +140,21 @@ static NTSTATUS idmap_rid_id_to_sid(struct idmap_domain *dom, struct id_map *map
  Single sid to id lookup function. 
 **********************************/
 
-static NTSTATUS idmap_rid_sid_to_id(struct idmap_rid_context *ctx, struct id_map *map)
+static NTSTATUS idmap_rid_sid_to_id(struct idmap_domain *dom, struct id_map *map)
 {
 	uint32_t rid;
+	struct idmap_rid_context *ctx;
+
+	ctx = talloc_get_type(dom->private_data, struct idmap_rid_context);
 
 	sid_peek_rid(map->sid, &rid);
-	map->xid.id = rid - ctx->base_rid + ctx->low_id;
+	map->xid.id = rid - ctx->base_rid + dom->low_id;
 
 	/* apply filters before returning result */
 
-	if ((map->xid.id < ctx->low_id) || (map->xid.id > ctx->high_id)) {
+	if (!idmap_unix_id_is_in_range(map->xid.id, dom)) {
 		DEBUG(5, ("Requested id (%u) out of range (%u - %u). Filtered!\n",
-				map->xid.id, ctx->low_id, ctx->high_id));
+				map->xid.id, dom->low_id, dom->high_id));
 		map->status = ID_UNMAPPED;
 		return NT_STATUS_NONE_MAPPED;
 	}
@@ -199,7 +202,6 @@ static NTSTATUS idmap_rid_unixids_to_sids(struct idmap_domain *dom, struct id_ma
 
 static NTSTATUS idmap_rid_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
-	struct idmap_rid_context *ridctx;
 	NTSTATUS ret;
 	int i;
 
@@ -207,12 +209,10 @@ static NTSTATUS idmap_rid_sids_to_unixids(struct idmap_domain *dom, struct id_ma
 	for (i = 0; ids[i]; i++) {
 		ids[i]->status = ID_UNKNOWN;
 	}
-	
-	ridctx = talloc_get_type(dom->private_data, struct idmap_rid_context);
 
 	for (i = 0; ids[i]; i++) {
 
-		ret = idmap_rid_sid_to_id(ridctx, ids[i]);
+		ret = idmap_rid_sid_to_id(dom, ids[i]);
 
 		if (( ! NT_STATUS_IS_OK(ret)) &&
 		    ( ! NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED))) {