From 3f39921e7e1175523766a108f338ea38038c5d79 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 17 Jun 2010 19:03:12 +0200 Subject: [PATCH] s3:idmap_ldap: use ranges from idmap domain in idmap_ldap_allocate_id() Second step in removing the idmap range from the idmap_ldap_alloc_context. --- source3/winbindd/idmap_ldap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index 5d746978857..ff8509a3966 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -325,7 +325,8 @@ static NTSTATUS idmap_ldap_alloc_init(struct idmap_domain *dom, 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; NTSTATUS ret = NT_STATUS_UNSUCCESSFUL; @@ -424,17 +425,17 @@ static NTSTATUS idmap_ldap_allocate_id(struct unixid *xid) switch (xid->type) { 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", - (unsigned long)idmap_alloc_ldap->high_uid)); + (unsigned long)dom->high_id)); goto done; } break; 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", - (unsigned long)idmap_alloc_ldap->high_uid)); + (unsigned long)dom->high_id)); goto done; } break;