sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s3:idmap_ldap: use ranges from idmap domain in idmap_ldap_allocate_id()

Browse Source 
Second step in removing the idmap range from the idmap_ldap_alloc_context.
This commit is contained in:
Michael Adam 2010-06-17 19:03:12 +02:00
parent 5518bcb840
commit 3f39921e7e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/winbindd/idmap_ldap.c
View File

@ -325,7 +325,8 @@ static NTSTATUS idmap_ldap_alloc_init(struct idmap_domain *dom,
Allocate a new uid or gid Allocate a new uid or gid
********************************/ ********************************/
static NTSTATUS idmap_ldap_allocate_id(struct unixid *xid) static NTSTATUS idmap_ldap_allocate_id(struct idmap_domain *dom,
struct unixid *xid)
{ {
TALLOC_CTX *ctx; TALLOC_CTX *ctx;
NTSTATUS ret = NT_STATUS_UNSUCCESSFUL; NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
@ -424,17 +425,17 @@ static NTSTATUS idmap_ldap_allocate_id(struct unixid *xid)
switch (xid->type) { switch (xid->type) {
case ID_TYPE_UID: case ID_TYPE_UID:
if (xid->id > idmap_alloc_ldap->high_uid) { if (xid->id > dom->high_id) {
DEBUG(0,("Cannot allocate uid above %lu!\n", DEBUG(0,("Cannot allocate uid above %lu!\n",
(unsigned long)idmap_alloc_ldap->high_uid)); (unsigned long)dom->high_id));
goto done; goto done;
} }
break; break;
case ID_TYPE_GID: case ID_TYPE_GID:
if (xid->id > idmap_alloc_ldap->high_gid) { if (xid->id > dom->high_id) {
DEBUG(0,("Cannot allocate gid above %lu!\n", DEBUG(0,("Cannot allocate gid above %lu!\n",
(unsigned long)idmap_alloc_ldap->high_uid)); (unsigned long)dom->high_id));
goto done; goto done;
} }
break; break;