summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-06-17 10:00:49 +0200
committerMichael Adam <obnox@samba.org>2010-08-14 02:10:52 +0200
commit634cd2e0451d4388c3e3f78239495cf595368b15 (patch)
tree3033424ad9dd795bb6c21bf05fcac11c2c12766a /source3
parent3a5f86216b820c4c57d46b586634b93e1ce423f2 (diff)
downloadsamba-634cd2e0451d4388c3e3f78239495cf595368b15.tar.gz
samba-634cd2e0451d4388c3e3f78239495cf595368b15.tar.bz2
samba-634cd2e0451d4388c3e3f78239495cf595368b15.zip
s3:idmap_ldap: use filter range from idmap domain, not idmap_ldap_context
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/idmap_ldap.c12
1 files 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;