s4: Switch to S3-style id mapping data types.

[kai/samba.git] / source4 / winbind / wb_sid2gid.c

diff --git a/source4/winbind/wb_sid2gid.c b/source4/winbind/wb_sid2gid.c
index eb4d6b0d21b74a5fbe00d9ef859a88b81f9c7356..9d9fabbbf8cdb3f798ae098d3fd53e181212f7e6 100644 (file)
--- a/source4/winbind/wb_sid2gid.c
+++ b/source4/winbind/wb_sid2gid.c
@@ -38,7 +38,7 @@ struct composite_context *wb_sid2gid_send(TALLOC_CTX *mem_ctx,
 {
        struct composite_context *result, *ctx;
        struct sid2gid_state *state;
-       struct id_mapping *ids;
+       struct id_map *ids;
 
        DEBUG(5, ("wb_sid2gid_send called\n"));
 
@@ -52,7 +52,7 @@ struct composite_context *wb_sid2gid_send(TALLOC_CTX *mem_ctx,
        result->private_data = state;
        state->service = service;
 
-       ids = talloc(result, struct id_mapping);
+       ids = talloc(result, struct id_map);
        if (composite_nomem(ids, result)) return result;
 
        ids->sid = dom_sid_dup(result, sid);
@@ -70,13 +70,13 @@ static void sid2gid_recv_gid(struct composite_context *ctx)
        struct sid2gid_state *state = talloc_get_type(ctx->async.private_data,
                                                      struct sid2gid_state);
 
-       struct id_mapping *ids = NULL;
+       struct id_map *ids = NULL;
 
        state->ctx->status = wb_sids2xids_recv(ctx, &ids);
        if (!composite_is_ok(state->ctx)) return;
 
-       if (!NT_STATUS_IS_OK(ids->status)) {
-               composite_error(state->ctx, ids->status);
+       if (ids->status != ID_MAPPED) {
+               composite_error(state->ctx, NT_STATUS_UNSUCCESSFUL);
                return;
        }