From 212468bc6e032c1f704a1d5042222b7299f9bcfb Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 29 Jul 2010 23:20:21 +0200 Subject: s3:idmap: use allocate_id() from the idmap_methods in idmap_allocate_unixid() The idmap alloc methods are being removed. --- source3/winbindd/idmap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c index aaccc0c8e4..5280136fdb 100644 --- a/source3/winbindd/idmap.c +++ b/source3/winbindd/idmap.c @@ -622,14 +622,22 @@ fail: static NTSTATUS idmap_allocate_unixid(struct unixid *id) { - struct idmap_alloc_context *ctx; + struct idmap_domain *dom; NTSTATUS ret; - if (!NT_STATUS_IS_OK(ret = idmap_alloc_init(&ctx))) { - return ret; + dom = idmap_find_domain(NULL); + + if (dom == NULL) { + return NT_STATUS_UNSUCCESSFUL; } - return ctx->methods->allocate_id(id); + if (dom->methods->allocate_id == NULL) { + return NT_STATUS_NOT_IMPLEMENTED; + } + + ret = dom->methods->allocate_id(dom, id); + + return ret; } -- cgit