summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-06-17 07:32:12 +0200
committerMichael Adam <obnox@samba.org>2010-08-14 02:10:47 +0200
commitf7a5f0987c014b26bafd4a3af8fc49396d735d34 (patch)
tree948a3fead1052cd7fe548126a6626a9af64abd4f /source3
parent0f248169d9b42fcd9f70d7cf8d13640011dd3256 (diff)
downloadsamba-f7a5f0987c014b26bafd4a3af8fc49396d735d34.tar.gz
samba-f7a5f0987c014b26bafd4a3af8fc49396d735d34.tar.bz2
samba-f7a5f0987c014b26bafd4a3af8fc49396d735d34.zip
s3:idmap_tdb: give idmap domain argument to idmap_tdb_id_to_sid
instead of idmap_tdb_context. This is in preparation of using the filter from the idmap_domain struct.
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/idmap_tdb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index fdea966ad6..e72be214ad 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -636,16 +636,19 @@ failed:
Single id to sid lookup function.
**********************************/
-static NTSTATUS idmap_tdb_id_to_sid(struct idmap_tdb_context *ctx, struct id_map *map)
+static NTSTATUS idmap_tdb_id_to_sid(struct idmap_domain *dom, struct id_map *map)
{
NTSTATUS ret;
TDB_DATA data;
char *keystr;
+ struct idmap_tdb_context *ctx;
- if (!ctx || !map) {
+ if (!dom || !map) {
return NT_STATUS_INVALID_PARAMETER;
}
+ ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
+
/* apply filters before checking */
if ((ctx->filter_low_id && (map->xid.id < ctx->filter_low_id)) ||
(ctx->filter_high_id && (map->xid.id > ctx->filter_high_id))) {
@@ -784,7 +787,7 @@ static NTSTATUS idmap_tdb_unixids_to_sids(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_id_to_sid(ctx, ids[i]);
+ ret = idmap_tdb_id_to_sid(dom, ids[i]);
if ( ! NT_STATUS_IS_OK(ret)) {
/* if it is just a failed mapping continue */