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:
e2524b9
)
s3:idmap_rid: use ranges from idmap_domain struct in idmap_rid_id_to_sid()
author
Michael Adam
<obnox@samba.org>
Tue, 22 Jun 2010 10:38:19 +0000
(12:38 +0200)
committer
Michael Adam
<obnox@samba.org>
Wed, 23 Jun 2010 10:40:38 +0000
(12:40 +0200)
source3/winbindd/idmap_rid.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/idmap_rid.c
b/source3/winbindd/idmap_rid.c
index 6d57ace4988e2fbdd0f0dc4bdf9300c3434f4767..b09f2e9453b9727a006aff67095e487dc79b4fa3 100644
(file)
--- a/
source3/winbindd/idmap_rid.c
+++ b/
source3/winbindd/idmap_rid.c
@@
-106,22
+106,26
@@
failed:
return ret;
}
return ret;
}
-static NTSTATUS idmap_rid_id_to_sid(struct idmap_
rid_context *ctx
, struct id_map *map)
+static NTSTATUS idmap_rid_id_to_sid(struct idmap_
domain *dom
, struct id_map *map)
{
{
- struct winbindd_domain *domain;
+ struct winbindd_domain *domain;
+ struct idmap_rid_context *ctx;
+
+ ctx = talloc_get_type(dom->private_data, struct idmap_rid_context);
/* apply filters before checking */
/* apply filters before checking */
- if (
(map->xid.id < ctx->low_id) || (map->xid.id > ctx->high_id
)) {
+ if (
!idmap_unix_id_is_in_range(map->xid.id, dom
)) {
DEBUG(5, ("Requested id (%u) out of range (%u - %u). Filtered!\n",
DEBUG(5, ("Requested id (%u) out of range (%u - %u). Filtered!\n",
- map->xid.id,
ctx->low_id, ctx
->high_id));
+ map->xid.id,
dom->low_id, dom
->high_id));
return NT_STATUS_NONE_MAPPED;
}
return NT_STATUS_NONE_MAPPED;
}
- if ( (domain = find_domain_from_name_noinit(ctx->domain_name)) == NULL ) {
+ domain = find_domain_from_name_noinit(dom->name);
+ if (domain == NULL ) {
return NT_STATUS_NO_SUCH_DOMAIN;
}
return NT_STATUS_NO_SUCH_DOMAIN;
}
-
- sid_compose(map->sid, &domain->sid, map->xid.id -
ctx
->low_id + ctx->base_rid);
+
+ sid_compose(map->sid, &domain->sid, map->xid.id -
dom
->low_id + ctx->base_rid);
/* We **really** should have some way of validating
the SID exists and is the correct type here. But
/* We **really** should have some way of validating
the SID exists and is the correct type here. But
@@
-167,7
+171,6
@@
static NTSTATUS idmap_rid_sid_to_id(struct idmap_rid_context *ctx, struct id_map
static NTSTATUS idmap_rid_unixids_to_sids(struct idmap_domain *dom, struct id_map **ids)
{
static NTSTATUS idmap_rid_unixids_to_sids(struct idmap_domain *dom, struct id_map **ids)
{
- struct idmap_rid_context *ridctx;
NTSTATUS ret;
int i;
NTSTATUS ret;
int i;
@@
-175,12
+178,10
@@
static NTSTATUS idmap_rid_unixids_to_sids(struct idmap_domain *dom, struct id_ma
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
- ridctx = talloc_get_type(dom->private_data, struct idmap_rid_context);
for (i = 0; ids[i]; i++) {
for (i = 0; ids[i]; i++) {
- ret = idmap_rid_id_to_sid(
ridctx
, ids[i]);
+ ret = idmap_rid_id_to_sid(
dom
, ids[i]);
if (( ! NT_STATUS_IS_OK(ret)) &&
( ! NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED))) {
if (( ! NT_STATUS_IS_OK(ret)) &&
( ! NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED))) {