winbindd: remove unused WINBINDD_DUAL_NAME2*ID and WINBINDD_DUAL_*ID2NAME calls

WINBINDD_DUAL_UID2NAME
WINBINDD_DUAL_NAME2UID
WINBINDD_DUAL_GID2NAME
WINBINDD_DUAL_NAME2GID

metze

diff --git a/source/nsswitch/winbind_struct_protocol.h b/source/nsswitch/winbind_struct_protocol.h
index e780cadb0ca9f67f431c4b6d38dcb22a2a6fa328..bc94d4e68f3d5ed934d2adf51566f5e556d884f1 100644 (file)
--- a/source/nsswitch/winbind_struct_protocol.h
+++ b/source/nsswitch/winbind_struct_protocol.h
@@ -156,11 +156,6 @@ enum winbindd_cmd {
        WINBINDD_DUAL_DUMP_MAPS,
 
        /* Wrapper around possibly blocking unix nss calls */
-       WINBINDD_DUAL_UID2NAME,
-       WINBINDD_DUAL_NAME2UID,
-       WINBINDD_DUAL_GID2NAME,
-       WINBINDD_DUAL_NAME2GID,
-
        WINBINDD_DUAL_USERINFO,
        WINBINDD_DUAL_GETSIDALIASES,
 

diff --git a/source/winbindd/winbindd_idmap.c b/source/winbindd/winbindd_idmap.c
index be090afbf1ef59b88a15b5e97f957f85f200cad5..dd63e1823697eea0d7d868a46ddd13eb24e9743c 100644 (file)
--- a/source/winbindd/winbindd_idmap.c
+++ b/source/winbindd/winbindd_idmap.c
@@ -329,130 +329,6 @@ enum winbindd_result winbindd_dual_sid2uid(struct winbindd_domain *domain,
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
-#if 0  /* not used */
-static void uid2name_recv(TALLOC_CTX *mem_ctx, bool success,
-                         struct winbindd_response *response,
-                         void *c, void *private_data);
-
-void winbindd_uid2name_async(TALLOC_CTX *mem_ctx, uid_t uid,
-                            void (*cont)(void *private_data, bool success,
-                                         const char *name),
-                            void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_UID2NAME;
-       request.data.uid = uid;
-       do_async(mem_ctx, idmap_child(), &request, uid2name_recv,
-                (void *)cont, private_data);
-}
-#endif /* not used */
-
-enum winbindd_result winbindd_dual_uid2name(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state)
-{
-       struct passwd *pw;
-
-       DEBUG(3, ("[%5lu]: uid2name %lu\n", (unsigned long)state->pid,
-                 (unsigned long)state->request.data.uid));
-
-       pw = getpwuid(state->request.data.uid);
-       if (pw == NULL) {
-               DEBUG(5, ("User %lu not found\n",
-                         (unsigned long)state->request.data.uid));
-               return WINBINDD_ERROR;
-       }
-
-       fstrcpy(state->response.data.name.name, pw->pw_name);
-       return WINBINDD_OK;
-}
-
-#if 0  /* not used */
-static void uid2name_recv(TALLOC_CTX *mem_ctx, bool success,
-                         struct winbindd_response *response,
-                         void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, const char *name) =
-               (void (*)(void *, bool, const char *))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger uid2name\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("uid2name returned an error\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       cont(private_data, True, response->data.name.name);
-}
-
-static void name2uid_recv(TALLOC_CTX *mem_ctx, bool success,
-                         struct winbindd_response *response,
-                         void *c, void *private_data);
-
-static void winbindd_name2uid_async(TALLOC_CTX *mem_ctx, const char *name,
-                                   void (*cont)(void *private_data, bool success,
-                                                uid_t uid),
-                                   void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_NAME2UID;
-       fstrcpy(request.data.username, name);
-       do_async(mem_ctx, idmap_child(), &request, name2uid_recv,
-                (void *)cont, private_data);
-}
-#endif /* not used */
-
-enum winbindd_result winbindd_dual_name2uid(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state)
-{
-       struct passwd *pw;
-
-       /* Ensure null termination */
-       state->request.data.username
-               [sizeof(state->request.data.username)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: name2uid %s\n", (unsigned long)state->pid,
-                 state->request.data.username));
-
-       pw = getpwnam(state->request.data.username);
-       if (pw == NULL) {
-               return WINBINDD_ERROR;
-       }
-
-       state->response.data.uid = pw->pw_uid;
-       return WINBINDD_OK;
-}
-
-#if 0  /* not used */
-static void name2uid_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 name2uid\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("name2uid returned an error\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       cont(private_data, True, response->data.uid);
-}
-#endif /* not used */
-
 static void winbindd_sid2gid_recv(TALLOC_CTX *mem_ctx, bool success,
                               struct winbindd_response *response,
                               void *c, void *private_data)
@@ -515,121 +391,6 @@ enum winbindd_result winbindd_dual_sid2gid(struct winbindd_domain *domain,
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
-static void gid2name_recv(TALLOC_CTX *mem_ctx, bool success,
-                         struct winbindd_response *response,
-                         void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, const char *name) =
-               (void (*)(void *, bool, const char *))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger gid2name\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("gid2name returned an error\n"));
-               cont(private_data, False, NULL);
-               return;
-       }
-
-       cont(private_data, True, response->data.name.name);
-}
-
-void winbindd_gid2name_async(TALLOC_CTX *mem_ctx, gid_t gid,
-                            void (*cont)(void *private_data, bool success,
-                                         const char *name),
-                            void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_GID2NAME;
-       request.data.gid = gid;
-       do_async(mem_ctx, idmap_child(), &request, gid2name_recv,
-                (void *)cont, private_data);
-}
-
-enum winbindd_result winbindd_dual_gid2name(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state)
-{
-       struct group *gr;
-
-       DEBUG(3, ("[%5lu]: gid2name %lu\n", (unsigned long)state->pid,
-                 (unsigned long)state->request.data.gid));
-
-       gr = getgrgid(state->request.data.gid);
-       if (gr == NULL)
-               return WINBINDD_ERROR;
-
-       fstrcpy(state->response.data.name.name, gr->gr_name);
-       return WINBINDD_OK;
-}
-
-#if 0  /* not used */
-static void name2gid_recv(TALLOC_CTX *mem_ctx, bool success,
-                         struct winbindd_response *response,
-                         void *c, void *private_data);
-
-static void winbindd_name2gid_async(TALLOC_CTX *mem_ctx, const char *name,
-                                   void (*cont)(void *private_data, bool success,
-                                                gid_t gid),
-                                   void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_NAME2GID;
-       fstrcpy(request.data.groupname, name);
-       do_async(mem_ctx, idmap_child(), &request, name2gid_recv,
-                (void *)cont, private_data);
-}
-#endif /* not used */
-
-enum winbindd_result winbindd_dual_name2gid(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state)
-{
-       struct group *gr;
-
-       /* Ensure null termination */
-       state->request.data.groupname
-               [sizeof(state->request.data.groupname)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: name2gid %s\n", (unsigned long)state->pid,
-                 state->request.data.groupname));
-
-       gr = getgrnam(state->request.data.groupname);
-       if (gr == NULL) {
-               return WINBINDD_ERROR;
-       }
-
-       state->response.data.gid = gr->gr_gid;
-       return WINBINDD_OK;
-}
-
-#if 0  /* not used */
-static void name2gid_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 name2gid\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("name2gid returned an error\n"));
-               cont(private_data, False, 0);
-               return;
-       }
-
-       cont(private_data, True, response->data.gid);
-}
-#endif /* not used */
-
 /* The following uid2sid/gid2sid functions has been contributed by
  * Keith Reynolds <Keith.Reynolds@centrify.com> */
 
@@ -818,22 +579,6 @@ static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
                .name           = "DUAL_GID2SID",
                .struct_cmd     = WINBINDD_DUAL_GID2SID,
                .struct_fn      = winbindd_dual_gid2sid,
-       },{
-               .name           = "DUAL_UID2NAME",
-               .struct_cmd     = WINBINDD_DUAL_UID2NAME,
-               .struct_fn      = winbindd_dual_uid2name,
-       },{
-               .name           = "DUAL_NAME2UID",
-               .struct_cmd     = WINBINDD_DUAL_NAME2UID,
-               .struct_fn      = winbindd_dual_name2uid,
-       },{
-               .name           = "DUAL_GID2NAME",
-               .struct_cmd     = WINBINDD_DUAL_GID2NAME,
-               .struct_fn      = winbindd_dual_gid2name,
-       },{
-               .name           = "DUAL_NAME2GID",
-               .struct_cmd     = WINBINDD_DUAL_NAME2GID,
-               .struct_fn      = winbindd_dual_name2gid,
        },{
                .name           = "DUAL_SET_MAPPING",
                .struct_cmd     = WINBINDD_DUAL_SET_MAPPING,