git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c7a8153
)
s3:idmap_ldap: use filter range from idmap domain, not idmap_ldap_context
author
Michael Adam
<obnox@samba.org>
Thu, 17 Jun 2010 08:00:49 +0000
(10:00 +0200)
committer
Michael Adam
<obnox@samba.org>
Wed, 23 Jun 2010 10:22:17 +0000
(12:22 +0200)
source3/winbindd/idmap_ldap.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/idmap_ldap.c
b/source3/winbindd/idmap_ldap.c
index b3537a7f3a087c5e6612a9dcef39c24f18305e18..cd0759c21524566958f2348452eb4453ae321f56 100644
(file)
--- a/
source3/winbindd/idmap_ldap.c
+++ b/
source3/winbindd/idmap_ldap.c
@@
-858,12
+858,10
@@
again:
}
id = strtoul(tmp, NULL, 10);
}
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,
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;
TALLOC_FREE(sidstr);
TALLOC_FREE(tmp);
continue;
@@
-1107,12
+1105,10
@@
again:
}
id = strtoul(tmp, NULL, 10);
}
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,
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;
TALLOC_FREE(sidstr);
TALLOC_FREE(tmp);
continue;