s3: Remove unused winbindd_gid2sid_async
[ira/wip.git] / source3 / winbindd / winbindd_idmap.c
index 98f8548083dd2e19cce7b2c6e77bf9b2b87c978c..d3f34b1da12090cd55c53d74fa1e11969e8ad099 100644 (file)
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-static const struct winbindd_child_dispatch_table idmap_dispatch_table[];
-
 static struct winbindd_child static_idmap_child;
 
-void init_idmap_child(void)
-{
-       setup_child(&static_idmap_child,
-                   idmap_dispatch_table,
-                   "log.winbindd", "idmap");
-}
-
 struct winbindd_child *idmap_child(void)
 {
        return &static_idmap_child;
 }
 
-static void winbindd_set_mapping_recv(TALLOC_CTX *mem_ctx, bool success,
-                                  struct winbindd_response *response,
-                                  void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ) = (void (*)(void *, bool))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger idmap_set_mapping\n"));
-               cont(private_data, False);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("idmap_set_mapping returned an error\n"));
-               cont(private_data, False);
-               return;
-       }
-
-       cont(private_data, True);
-}
-
-void winbindd_set_mapping_async(TALLOC_CTX *mem_ctx, const struct id_map *map,
-                            void (*cont)(void *private_data, bool success),
-                            void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_SET_MAPPING;
-       request.data.dual_idmapset.id = map->xid.id;
-       request.data.dual_idmapset.type = map->xid.type;
-       sid_to_fstring(request.data.dual_idmapset.sid, map->sid);
-
-       do_async(mem_ctx, idmap_child(), &request, winbindd_set_mapping_recv,
-                (void *)cont, private_data);
-}
-
-enum winbindd_result winbindd_dual_set_mapping(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state)
-{
-       struct id_map map;
-       DOM_SID sid;
-       NTSTATUS result;
-
-       DEBUG(3, ("[%5lu]: dual_idmapset\n", (unsigned long)state->pid));
-
-       if (!string_to_sid(&sid, state->request.data.dual_idmapset.sid))
-               return WINBINDD_ERROR;
-
-       map.sid = &sid;
-       map.xid.id = state->request.data.dual_idmapset.id;
-       map.xid.type = state->request.data.dual_idmapset.type;
-       map.status = ID_MAPPED;
-
-       result = idmap_set_mapping(&map);
-       return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
-}
-
-static void winbindd_set_hwm_recv(TALLOC_CTX *mem_ctx, bool success,
-                                  struct winbindd_response *response,
-                                  void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ) = (void (*)(void *, bool))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger idmap_set_hwm\n"));
-               cont(private_data, False);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("idmap_set_hwm returned an error\n"));
-               cont(private_data, False);
-               return;
-       }
-
-       cont(private_data, True);
-}
-
-void winbindd_set_hwm_async(TALLOC_CTX *mem_ctx, const struct unixid *xid,
-                            void (*cont)(void *private_data, bool success),
-                            void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_SET_HWM;
-       request.data.dual_idmapset.id = xid->id;
-       request.data.dual_idmapset.type = xid->type;
-
-       do_async(mem_ctx, idmap_child(), &request, winbindd_set_hwm_recv,
-                (void *)cont, private_data);
-}
-
-enum winbindd_result winbindd_dual_set_hwm(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state)
-{
-       struct unixid xid;
-       NTSTATUS result;
-
-       DEBUG(3, ("[%5lu]: dual_set_hwm\n", (unsigned long)state->pid));
-
-       xid.id = state->request.data.dual_idmapset.id;
-       xid.type = state->request.data.dual_idmapset.type;
-
-       switch (xid.type) {
-       case ID_TYPE_UID:
-               result = idmap_set_uid_hwm(&xid);
-               break;
-       case ID_TYPE_GID:
-               result = idmap_set_gid_hwm(&xid);
-               break;
-       default:
-               return WINBINDD_ERROR;
-       }
-       return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
-}
-
-static void winbindd_sids2xids_recv(TALLOC_CTX *mem_ctx, bool success,
-                              struct winbindd_response *response,
-                              void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, void *, int) =
-               (void (*)(void *, bool, void *, int))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger sids2xids\n"));
-               cont(private_data, False, NULL, 0);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("sids2xids returned an error\n"));
-               cont(private_data, False, NULL, 0);
-               return;
-       }
-
-       cont(private_data, True, response->extra_data.data, response->length - sizeof(response));
-}
-
-void winbindd_sids2xids_async(TALLOC_CTX *mem_ctx, void *sids, int size,
-                        void (*cont)(void *private_data, bool success, void *data, int len),
-                        void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_SIDS2XIDS;
-       request.extra_data.data = (char *)sids;
-       request.extra_len = size;
-       do_async(mem_ctx, idmap_child(), &request, winbindd_sids2xids_recv,
-                (void *)cont, private_data);
-}
-
-enum winbindd_result winbindd_dual_sids2xids(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state)
-{
-       DOM_SID *sids;
-       struct unixid *xids;
-       struct id_map **ids;
-       NTSTATUS result;
-       int num, i;
-
-       DEBUG(3, ("[%5lu]: sids to unix ids\n", (unsigned long)state->pid));
-
-       if (state->request.extra_len == 0) {
-               DEBUG(0, ("Invalid buffer size!\n"));
-               return WINBINDD_ERROR;
-       }
-
-       sids = (DOM_SID *)state->request.extra_data.data;
-       num = state->request.extra_len / sizeof(DOM_SID);
-
-       ids = TALLOC_ARRAY(state->mem_ctx, struct id_map *, num);
-       if ( ! ids) {
-               DEBUG(0, ("Out of memory!\n"));
-               return WINBINDD_ERROR;
-       }
-       for (i = 0; i < num; i++) {
-               ids[i] = TALLOC_P(ids, struct id_map);
-               if ( ! ids[i]) {
-                       DEBUG(0, ("Out of memory!\n"));
-                       talloc_free(ids);
-                       return WINBINDD_ERROR;
-               }
-               ids[i]->sid = &sids[i];
-       }
-
-       result = idmap_sids_to_unixids(ids, num);
-
-       if (NT_STATUS_IS_OK(result)) {
-
-               xids = SMB_MALLOC_ARRAY(struct unixid, num);
-               if ( ! xids) {
-                       DEBUG(0, ("Out of memory!\n"));
-                       talloc_free(ids);
-                       return WINBINDD_ERROR;
-               }
-
-               for (i = 0; i < num; i++) {
-                       if (ids[i]->status == ID_MAPPED) {
-                               xids[i].type = ids[i]->xid.type;
-                               xids[i].id = ids[i]->xid.id;
-                       } else {
-                               xids[i].type = -1;
-                       }
-               }
-
-               state->response.length = sizeof(state->response) + (sizeof(struct unixid) * num);
-               state->response.extra_data.data = xids;
-
-       } else {
-               DEBUG (2, ("idmap_sids_to_unixids returned an error: 0x%08x\n", NT_STATUS_V(result)));
-               talloc_free(ids);
-               return WINBINDD_ERROR;
-       }
-
-       talloc_free(ids);
-       return WINBINDD_OK;
-}
-
-static void winbindd_sid2uid_recv(TALLOC_CTX *mem_ctx, bool success,
-                              struct winbindd_response *response,
-                              void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, uid_t uid) =
-               (void (*)(void *, bool, uid_t))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger sid2uid\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("sid2uid returned an error\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       cont(private_data, True, response->data.uid);
-}
-
-void winbindd_sid2uid_async(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
-                        void (*cont)(void *private_data, bool success, uid_t uid),
-                        void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_SID2UID;
-       sid_to_fstring(request.data.dual_sid2id.sid, sid);
-       do_async(mem_ctx, idmap_child(), &request, winbindd_sid2uid_recv,
-                (void *)cont, private_data);
-}
-
 enum winbindd_result winbindd_dual_sid2uid(struct winbindd_domain *domain,
                                           struct winbindd_cli_state *state)
 {
@@ -313,59 +52,24 @@ enum winbindd_result winbindd_dual_sid2uid(struct winbindd_domain *domain,
        NTSTATUS result;
 
        DEBUG(3, ("[%5lu]: sid to uid %s\n", (unsigned long)state->pid,
-                 state->request.data.dual_sid2id.sid));
+                 state->request->data.dual_sid2id.sid));
 
-       if (!string_to_sid(&sid, state->request.data.dual_sid2id.sid)) {
+       if (!string_to_sid(&sid, state->request->data.dual_sid2id.sid)) {
                DEBUG(1, ("Could not get convert sid %s from string\n",
-                         state->request.data.dual_sid2id.sid));
+                         state->request->data.dual_sid2id.sid));
                return WINBINDD_ERROR;
        }
 
-       /* Find uid for this sid and return it, possibly ask the slow remote idmap */
+       result = idmap_sid_to_uid(state->request->domain_name, &sid,
+                                 &state->response->data.uid);
 
-       result = idmap_sid_to_uid(&sid, &(state->response.data.uid));
+       DEBUG(10, ("winbindd_dual_sid2uid: 0x%08x - %s - %u\n",
+                  NT_STATUS_V(result), sid_string_dbg(&sid),
+                  (unsigned int)state->response->data.uid));
 
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
-static void winbindd_sid2gid_recv(TALLOC_CTX *mem_ctx, bool success,
-                              struct winbindd_response *response,
-                              void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, gid_t gid) =
-               (void (*)(void *, bool, gid_t))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger sid2gid\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("sid2gid returned an error\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       cont(private_data, True, response->data.gid);
-}
-
-void winbindd_sid2gid_async(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
-                        void (*cont)(void *private_data, bool success, gid_t gid),
-                        void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_SID2GID;
-       sid_to_fstring(request.data.dual_sid2id.sid, sid);
-
-       DEBUG(7,("winbindd_sid2gid_async: Resolving %s to a gid\n",
-               request.data.dual_sid2id.sid));
-
-       do_async(mem_ctx, idmap_child(), &request, winbindd_sid2gid_recv,
-                (void *)cont, private_data);
-}
-
 enum winbindd_result winbindd_dual_sid2gid(struct winbindd_domain *domain,
                                           struct winbindd_cli_state *state)
 {
@@ -373,63 +77,26 @@ enum winbindd_result winbindd_dual_sid2gid(struct winbindd_domain *domain,
        NTSTATUS result;
 
        DEBUG(3, ("[%5lu]: sid to gid %s\n", (unsigned long)state->pid,
-                 state->request.data.dual_sid2id.sid));
+                 state->request->data.dual_sid2id.sid));
 
-       if (!string_to_sid(&sid, state->request.data.dual_sid2id.sid)) {
+       if (!string_to_sid(&sid, state->request->data.dual_sid2id.sid)) {
                DEBUG(1, ("Could not get convert sid %s from string\n",
-                         state->request.data.dual_sid2id.sid));
+                         state->request->data.dual_sid2id.sid));
                return WINBINDD_ERROR;
        }
 
        /* Find gid for this sid and return it, possibly ask the slow remote idmap */
 
-       result = idmap_sid_to_gid(&sid, &state->response.data.gid);
+       result = idmap_sid_to_gid(state->request->domain_name, &sid,
+                                 &state->response->data.gid);
 
        DEBUG(10, ("winbindd_dual_sid2gid: 0x%08x - %s - %u\n",
                   NT_STATUS_V(result), sid_string_dbg(&sid),
-                  state->response.data.gid));
+                  (unsigned int)state->response->data.gid));
 
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
-/* The following uid2sid/gid2sid functions has been contributed by
- * Keith Reynolds <Keith.Reynolds@centrify.com> */
-
-static void winbindd_uid2sid_recv(TALLOC_CTX *mem_ctx, bool success,
-                                 struct winbindd_response *response,
-                                 void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, const char *sid) =
-               (void (*)(void *, bool, const char *))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger uid2sid\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("uid2sid returned an error\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       cont(private_data, True, response->data.sid.sid);
-}
-
-void winbindd_uid2sid_async(TALLOC_CTX *mem_ctx, uid_t uid,
-                           void (*cont)(void *private_data, bool success, const char *sid),
-                           void *private_data)
-{
-       struct winbindd_request request;
-
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_UID2SID;
-       request.data.uid = uid;
-       do_async(mem_ctx, idmap_child(), &request, winbindd_uid2sid_recv,
-                (void *)cont, private_data);
-}
-
 enum winbindd_result winbindd_dual_uid2sid(struct winbindd_domain *domain,
                                           struct winbindd_cli_state *state)
 {
@@ -438,55 +105,21 @@ enum winbindd_result winbindd_dual_uid2sid(struct winbindd_domain *domain,
 
        DEBUG(3,("[%5lu]: uid to sid %lu\n",
                 (unsigned long)state->pid,
-                (unsigned long) state->request.data.uid));
+                (unsigned long) state->request->data.uid));
 
        /* Find sid for this uid and return it, possibly ask the slow remote idmap */
-       result = idmap_uid_to_sid(&sid, state->request.data.uid);
+       result = idmap_uid_to_sid(state->request->domain_name, &sid,
+                                 state->request->data.uid);
 
        if (NT_STATUS_IS_OK(result)) {
-               sid_to_fstring(state->response.data.sid.sid, &sid);
-               state->response.data.sid.type = SID_NAME_USER;
+               sid_to_fstring(state->response->data.sid.sid, &sid);
+               state->response->data.sid.type = SID_NAME_USER;
                return WINBINDD_OK;
        }
 
        return WINBINDD_ERROR;
 }
 
-static void winbindd_gid2sid_recv(TALLOC_CTX *mem_ctx, bool success,
-                                 struct winbindd_response *response,
-                                 void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, const char *sid) =
-               (void (*)(void *, bool, const char *))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger gid2sid\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("gid2sid returned an error\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       cont(private_data, True, response->data.sid.sid);
-}
-
-void winbindd_gid2sid_async(TALLOC_CTX *mem_ctx, gid_t gid,
-                           void (*cont)(void *private_data, bool success, const char *sid),
-                           void *private_data)
-{
-       struct winbindd_request request;
-
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_GID2SID;
-       request.data.gid = gid;
-       do_async(mem_ctx, idmap_child(), &request, winbindd_gid2sid_recv,
-                (void *)cont, private_data);
-}
-
 enum winbindd_result winbindd_dual_gid2sid(struct winbindd_domain *domain,
                                           struct winbindd_cli_state *state)
 {
@@ -495,17 +128,18 @@ enum winbindd_result winbindd_dual_gid2sid(struct winbindd_domain *domain,
 
        DEBUG(3,("[%5lu]: gid %lu to sid\n",
                (unsigned long)state->pid,
-               (unsigned long) state->request.data.gid));
+               (unsigned long) state->request->data.gid));
 
        /* Find sid for this gid and return it, possibly ask the slow remote idmap */
-       result = idmap_gid_to_sid(&sid, state->request.data.gid);
+       result = idmap_gid_to_sid(state->request->domain_name, &sid,
+                                 state->request->data.gid);
 
        if (NT_STATUS_IS_OK(result)) {
-               sid_to_fstring(state->response.data.sid.sid, &sid);
+               sid_to_fstring(state->response->data.sid.sid, &sid);
                DEBUG(10, ("[%5lu]: retrieved sid: %s\n",
                           (unsigned long)state->pid,
-                          state->response.data.sid.sid));
-               state->response.data.sid.type = SID_NAME_DOM_GRP;
+                          state->response->data.sid.sid));
+               state->response->data.sid.type = SID_NAME_DOM_GRP;
                return WINBINDD_OK;
        }
 
@@ -514,6 +148,10 @@ enum winbindd_result winbindd_dual_gid2sid(struct winbindd_domain *domain,
 
 static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
        {
+               .name           = "PING",
+               .struct_cmd     = WINBINDD_PING,
+               .struct_fn      = winbindd_dual_ping,
+       },{
                .name           = "DUAL_SID2UID",
                .struct_cmd     = WINBINDD_DUAL_SID2UID,
                .struct_fn      = winbindd_dual_sid2uid,
@@ -521,12 +159,6 @@ static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
                .name           = "DUAL_SID2GID",
                .struct_cmd     = WINBINDD_DUAL_SID2GID,
                .struct_fn      = winbindd_dual_sid2gid,
-#if 0   /* DISABLED until we fix the interface in Samba 3.0.26 --jerry */
-       },{
-               .name           = "DUAL_SIDS2XIDS",
-               .struct_cmd     = WINBINDD_DUAL_SIDS2XIDS,
-               .struct_fn      = winbindd_dual_sids2xids,
-#endif  /* end DISABLED */
        },{
                .name           = "DUAL_UID2SID",
                .struct_cmd     = WINBINDD_DUAL_UID2SID,
@@ -536,22 +168,17 @@ static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
                .struct_cmd     = WINBINDD_DUAL_GID2SID,
                .struct_fn      = winbindd_dual_gid2sid,
        },{
-               .name           = "DUAL_SET_MAPPING",
-               .struct_cmd     = WINBINDD_DUAL_SET_MAPPING,
-               .struct_fn      = winbindd_dual_set_mapping,
-       },{
-               .name           = "DUAL_SET_HWMS",
-               .struct_cmd     = WINBINDD_DUAL_SET_HWM,
-               .struct_fn      = winbindd_dual_set_hwm,
-       },{
-               .name           = "ALLOCATE_UID",
-               .struct_cmd     = WINBINDD_ALLOCATE_UID,
-               .struct_fn      = winbindd_dual_allocate_uid,
-       },{
-               .name           = "ALLOCATE_GID",
-               .struct_cmd     = WINBINDD_ALLOCATE_GID,
-               .struct_fn      = winbindd_dual_allocate_gid,
+               .name           = "NDRCMD",
+               .struct_cmd     = WINBINDD_DUAL_NDRCMD,
+               .struct_fn      = winbindd_dual_ndrcmd,
        },{
                .name           = NULL,
        }
 };
+
+void init_idmap_child(void)
+{
+       setup_child(NULL, &static_idmap_child,
+                   idmap_dispatch_table,
+                   "log.winbindd", "idmap");
+}