Changeset 740 for vendor/current/source4/winbind/wb_sids2xids.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/winbind/wb_sids2xids.c (modified) (5 diffs)

vendor/current/source4/winbind/wb_sids2xids.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 sids2xids_state {
         struct composite_context *ctx;
         struct wbsrv_service *service;
-        struct id_mapping *ids;
+        struct id_map *ids;
         int count;
 };
@@ -37 +34 @@
 struct composite_context *wb_sids2xids_send(TALLOC_CTX *mem_ctx,
                                             struct wbsrv_service *service,
-                                            int count, struct id_mapping *ids)
+                                            unsigned int count, struct id_map *ids)
 {
         struct composite_context *result;
         struct sids2xids_state *state;
+        struct id_map **pointer_array;
+        unsigned int i;
 
         DEBUG(5, ("wb_sids2xids_send called\n"));
@@ -56 +55 @@
         state->ids = ids;
 
+        /* We need to convert between calling conventions here - the
+         * values are filled in by reference, so we just need to
+         * provide pointers to them */
+        pointer_array = talloc_array(state, struct id_map *, count+1);
+        if (composite_nomem(pointer_array, result)) return result;
+
+        for (i=0; i < count; i++) {
+                pointer_array[i] = &ids[i];
+        }
+        pointer_array[i] = NULL;
+
         state->ctx->status = idmap_sids_to_xids(service->idmap_ctx, mem_ctx,
-                                                count, state->ids);
+                                                pointer_array);
         if (!composite_is_ok(state->ctx)) return result;
 
@@ -65 +75 @@
 
 NTSTATUS wb_sids2xids_recv(struct composite_context *ctx,
-                           struct id_mapping **ids)
+                           struct id_map **ids)
 {
         NTSTATUS status = composite_wait(ctx);
@@ -73 +83 @@
         DEBUG(5, ("wb_sids2xids_recv called\n"));
 
+        /* We don't have to mess with pointer_array on the way out, as
+         * the results are filled into the pointers the caller
+         * supplied */
         *ids = state->ids;