summaryrefslogtreecommitdiff
path: root/source4/winbind/wb_gid2sid.c
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2008-02-18 14:30:17 +0100
committerKai Blin <kai@samba.org>2008-02-21 11:22:06 +0100
commit9c7f714962bdfe280baed42ed6a1e35a422a0267 (patch)
tree19e6820a91d05f44cdec5b768221800b9727d1ba /source4/winbind/wb_gid2sid.c
parent895874d9663ccb95883579d145018ec8a8add9c8 (diff)
downloadsamba-9c7f714962bdfe280baed42ed6a1e35a422a0267.tar.gz
samba-9c7f714962bdfe280baed42ed6a1e35a422a0267.tar.bz2
samba-9c7f714962bdfe280baed42ed6a1e35a422a0267.zip
idmap: Handle gid->SID mapping
(This used to be commit 6f2d95030cd7b4b22d1b75d15b76881449eda697)
Diffstat (limited to 'source4/winbind/wb_gid2sid.c')
-rw-r--r--source4/winbind/wb_gid2sid.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/source4/winbind/wb_gid2sid.c b/source4/winbind/wb_gid2sid.c
index 5c0b87118d..f2577029aa 100644
--- a/source4/winbind/wb_gid2sid.c
+++ b/source4/winbind/wb_gid2sid.c
@@ -25,6 +25,7 @@
#include "smbd/service_task.h"
#include "winbind/wb_helper.h"
#include "libcli/security/proto.h"
+#include "winbind/idmap.h"
struct gid2sid_state {
struct composite_context *ctx;
@@ -50,10 +51,14 @@ struct composite_context *wb_gid2sid_send(TALLOC_CTX *mem_ctx,
result->private_data = state;
state->service = service;
- /* FIXME: This is a stub so far.
- * We cheat by just using the gid as RID with the domain SID.*/
- state->sid = dom_sid_add_rid(result, service->primary_sid, gid);
- if (composite_nomem(state->sid, state->ctx)) return result;
+ state->ctx->status = idmap_gid_to_sid(service->idmap_ctx, mem_ctx, gid,
+ &state->sid);
+ if (NT_STATUS_EQUAL(state->ctx->status, NT_STATUS_RETRY)) {
+ state->ctx->status = idmap_gid_to_sid(service->idmap_ctx,
+ mem_ctx, gid,
+ &state->sid);
+ }
+ if (!composite_is_ok(state->ctx)) return result;
composite_done(state->ctx);
return result;