From 634cd2e0451d4388c3e3f78239495cf595368b15 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 17 Jun 2010 10:00:49 +0200 Subject: s3:idmap_ldap: use filter range from idmap domain, not idmap_ldap_context --- source3/winbindd/idmap_ldap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index 1a534af7f8..869a3d12ce 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -856,12 +856,10 @@ again: } id = strtoul(tmp, NULL, 10); - if ((id == 0) || - (ctx->filter_low_id && (id < ctx->filter_low_id)) || - (ctx->filter_high_id && (id > ctx->filter_high_id))) { + if (!idmap_unix_id_is_in_range(id, dom)) { DEBUG(5, ("Requested id (%u) out of range (%u - %u). " "Filtered!\n", id, - ctx->filter_low_id, ctx->filter_high_id)); + dom->low_id, dom->high_id)); TALLOC_FREE(sidstr); TALLOC_FREE(tmp); continue; @@ -1105,12 +1103,10 @@ again: } id = strtoul(tmp, NULL, 10); - if ((id == 0) || - (ctx->filter_low_id && (id < ctx->filter_low_id)) || - (ctx->filter_high_id && (id > ctx->filter_high_id))) { + if (!idmap_unix_id_is_in_range(id, dom)) { DEBUG(5, ("Requested id (%u) out of range (%u - %u). " "Filtered!\n", id, - ctx->filter_low_id, ctx->filter_high_id)); + dom->low_id, dom->high_id)); TALLOC_FREE(sidstr); TALLOC_FREE(tmp); continue; -- cgit