s3: Remove some unused dual functions

diff --git a/source3/winbindd/winbindd_idmap.c b/source3/winbindd/winbindd_idmap.c
index 5d7496bd8301852644aaf944f57dc4477d4a31f4..028026087d603e548c28b54eda9d2c4cbc9bdfbf 100644 (file)
--- a/source3/winbindd/winbindd_idmap.c
+++ b/source3/winbindd/winbindd_idmap.c
@@ -34,128 +34,11 @@ struct winbindd_child *idmap_child(void)
        return &static_idmap_child;
 }
 
-enum winbindd_result winbindd_dual_sid2uid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state)
-{
-       DOM_SID sid;
-       NTSTATUS result;
-
-       DEBUG(3, ("[%5lu]: sid to uid %s\n", (unsigned long)state->pid,
-                 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));
-               return WINBINDD_ERROR;
-       }
-
-       result = idmap_sid_to_uid(state->request->domain_name, &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;
-}
-
-enum winbindd_result winbindd_dual_sid2gid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state)
-{
-       DOM_SID sid;
-       NTSTATUS result;
-
-       DEBUG(3, ("[%5lu]: sid to gid %s\n", (unsigned long)state->pid,
-                 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));
-               return WINBINDD_ERROR;
-       }
-
-       /* Find gid for this sid and return it, possibly ask the slow remote idmap */
-
-       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),
-                  (unsigned int)state->response->data.gid));
-
-       return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
-}
-
-enum winbindd_result winbindd_dual_uid2sid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state)
-{
-       DOM_SID sid;
-       NTSTATUS result;
-
-       DEBUG(3,("[%5lu]: uid to sid %lu\n",
-                (unsigned long)state->pid,
-                (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(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;
-               return WINBINDD_OK;
-       }
-
-       return WINBINDD_ERROR;
-}
-
-enum winbindd_result winbindd_dual_gid2sid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state)
-{
-       DOM_SID sid;
-       NTSTATUS result;
-
-       DEBUG(3,("[%5lu]: gid %lu to sid\n",
-               (unsigned long)state->pid,
-               (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(state->request->domain_name, &sid,
-                                 state->request->data.gid);
-
-       if (NT_STATUS_IS_OK(result)) {
-               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;
-               return WINBINDD_OK;
-       }
-
-       return WINBINDD_ERROR;
-}
-
 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,
-       },{
-               .name           = "DUAL_SID2GID",
-               .struct_cmd     = WINBINDD_DUAL_SID2GID,
-               .struct_fn      = winbindd_dual_sid2gid,
-       },{
-               .name           = "DUAL_UID2SID",
-               .struct_cmd     = WINBINDD_DUAL_UID2SID,
-               .struct_fn      = winbindd_dual_uid2sid,
-       },{
-               .name           = "DUAL_GID2SID",
-               .struct_cmd     = WINBINDD_DUAL_GID2SID,
-               .struct_fn      = winbindd_dual_gid2sid,
        },{
                .name           = "NDRCMD",
                .struct_cmd     = WINBINDD_DUAL_NDRCMD,

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index fd9e86e0d6be8d5b15b975de73405536a103d48d..dcb8c30f0f36a8ec0c9bae063e755cac951c395d 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -391,14 +391,6 @@ void winbindd_sids2xids_async(TALLOC_CTX *mem_ctx, void *sids, int size,
                         void *private_data);
 enum winbindd_result winbindd_dual_sids2xids(struct winbindd_domain *domain,
                                           struct winbindd_cli_state *state);
-enum winbindd_result winbindd_dual_sid2uid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state);
-enum winbindd_result winbindd_dual_sid2gid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state);
-enum winbindd_result winbindd_dual_uid2sid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state);
-enum winbindd_result winbindd_dual_gid2sid(struct winbindd_domain *domain,
-                                          struct winbindd_cli_state *state);
 
 /* The following definitions come from winbindd/winbindd_locator.c  */