From 053e4510cd4a674e3c9809b0829f32e1bca183ea Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 17 Jun 2010 07:35:28 +0200 Subject: s3:idmap_tdb: give idmap domain argument to idmap_tdb_sid_to_id instead of idmap_tdb_context. This is in preparation of using the filter from the idmap_domain struct. --- source3/winbindd/idmap_tdb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3/winbindd/idmap_tdb.c') diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c index e72be214ad..7f36c636ab 100644 --- a/source3/winbindd/idmap_tdb.c +++ b/source3/winbindd/idmap_tdb.c @@ -712,14 +712,17 @@ done: Single sid to id lookup function. **********************************/ -static NTSTATUS idmap_tdb_sid_to_id(struct idmap_tdb_context *ctx, struct id_map *map) +static NTSTATUS idmap_tdb_sid_to_id(struct idmap_domain *dom, struct id_map *map) { NTSTATUS ret; TDB_DATA data; char *keystr; unsigned long rec_id = 0; + struct idmap_tdb_context *ctx; TALLOC_CTX *tmp_ctx = talloc_stackframe(); + ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context); + keystr = sid_string_talloc(tmp_ctx, map->sid); if (keystr == NULL) { DEBUG(0, ("Out of memory!\n")); @@ -830,7 +833,7 @@ static NTSTATUS idmap_tdb_sids_to_unixids(struct idmap_domain *dom, struct id_ma ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context); for (i = 0; ids[i]; i++) { - ret = idmap_tdb_sid_to_id(ctx, ids[i]); + ret = idmap_tdb_sid_to_id(dom, ids[i]); if ( ! NT_STATUS_IS_OK(ret)) { /* if it is just a failed mapping continue */ -- cgit