diff options
| author | Michael Adam <obnox@samba.org> | 2010-06-17 07:35:28 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2010-08-14 02:10:47 +0200 |
| commit | 053e4510cd4a674e3c9809b0829f32e1bca183ea (patch) | |
| tree | 31d8a9a03e60a5c8499b52c34feff6388a6e72d2 | |
| parent | f7a5f0987c014b26bafd4a3af8fc49396d735d34 (diff) | |
| download | samba-053e4510cd4a674e3c9809b0829f32e1bca183ea.tar.gz samba-053e4510cd4a674e3c9809b0829f32e1bca183ea.tar.bz2 samba-053e4510cd4a674e3c9809b0829f32e1bca183ea.zip | |
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.
| -rw-r--r-- | source3/winbindd/idmap_tdb.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 */ |