Changeset 745 for trunk/server/source4/winbind/wb_gid2sid.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/winbind/wb_gid2sid.c (modified) (4 diffs)

trunk/server/source4/winbind/wb_gid2sid.c

@@ -24 +24 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
-#include "winbind/wb_helper.h"
-#include "libcli/security/proto.h"
-#include "winbind/idmap.h"
 
 struct gid2sid_state {
@@ -41 +38 @@
         struct composite_context *result, *ctx;
         struct gid2sid_state *state;
-        struct unixid *unixid;
-        struct id_mapping *ids;
+        struct id_map *ids;
 
         DEBUG(5, ("wb_gid2sid_send called\n"));
@@ -56 +52 @@
         state->service = service;
 
-        unixid = talloc(result, struct unixid);
-        if (composite_nomem(unixid, result)) return result;
-        unixid->id = gid;
-        unixid->type = ID_TYPE_GID;
-
-        ids = talloc(result, struct id_mapping);
+        ids = talloc(result, struct id_map);
         if (composite_nomem(ids, result)) return result;
-        ids->unixid = unixid;
+        ids->xid.id = gid;
+        ids->xid.type = ID_TYPE_GID;
         ids->sid = NULL;
 
@@ -77 +69 @@
         struct gid2sid_state *state = talloc_get_type(ctx->async.private_data,
                                                       struct gid2sid_state);
-        struct id_mapping *ids = NULL;
+        struct id_map *ids = NULL;
         state->ctx->status = wb_xids2sids_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;
         }