wb-ndr: remove unused WINBINDD_DUAL_USERINFO support

metze

diff --git a/source/winbindd/winbindd_domain.c b/source/winbindd/winbindd_domain.c
index 5d040c63fda5e32c2f434f2f80fccb9247b1ea79..462a0650e472ee620e717c805ed76a137251a101 100644 (file)
--- a/source/winbindd/winbindd_domain.c
+++ b/source/winbindd/winbindd_domain.c
@@ -65,10 +65,6 @@ static const struct winbindd_child_dispatch_table domain_dispatch_table[] = {
                .name           = "PAM_CHAUTHTOK",
                .struct_cmd     = WINBINDD_PAM_CHAUTHTOK,
                .struct_fn      = winbindd_dual_pam_chauthtok,
-       },{
-               .name           = "DUAL_USERINFO",
-               .struct_cmd     = WINBINDD_DUAL_USERINFO,
-               .struct_fn      = winbindd_dual_userinfo,
        },{
                .name           = "GETUSERDOMGROUPS",
                .struct_cmd     = WINBINDD_GETUSERDOMGROUPS,

diff --git a/source/winbindd/winbindd_user.c b/source/winbindd/winbindd_user.c
index 6241d84fe6d0621ecf5e92499e608a30fc079469..38aa7c13236d95132b16cb03d6d44570412305c4 100644 (file)
--- a/source/winbindd/winbindd_user.c
+++ b/source/winbindd/winbindd_user.c
@@ -123,49 +123,6 @@ static bool winbindd_fill_pwent(char *dom_name, char *user_name,
        return True;
 }
 
-/* Wrapper for domain->methods->query_user, only on the parent->child pipe */
-
-enum winbindd_result winbindd_dual_userinfo(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state)
-{
-       DOM_SID sid;
-       WINBIND_USERINFO user_info;
-       NTSTATUS status;
-
-       /* Ensure null termination */
-       state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
-
-       DEBUG(3, ("[%5lu]: lookupsid %s\n", (unsigned long)state->pid, 
-                 state->request.data.sid));
-
-       if (!string_to_sid(&sid, state->request.data.sid)) {
-               DEBUG(5, ("%s not a SID\n", state->request.data.sid));
-               return WINBINDD_ERROR;
-       }
-
-       status = domain->methods->query_user(domain, state->mem_ctx,
-                                            &sid, &user_info);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("error getting user info for sid %s\n",
-                         sid_string_dbg(&sid)));
-               return WINBINDD_ERROR;
-       }
-
-       fstrcpy(state->response.data.user_info.acct_name, user_info.acct_name);
-       fstrcpy(state->response.data.user_info.full_name, user_info.full_name);
-       fstrcpy(state->response.data.user_info.homedir, user_info.homedir);
-       fstrcpy(state->response.data.user_info.shell, user_info.shell);
-       state->response.data.user_info.primary_gid = user_info.primary_gid;     
-       if (!sid_peek_check_rid(&domain->sid, &user_info.group_sid,
-                               &state->response.data.user_info.group_rid)) {
-               DEBUG(1, ("Could not extract group rid out of %s\n",
-                         sid_string_dbg(&sid)));
-               return WINBINDD_ERROR;
-       }
-
-       return WINBINDD_OK;
-}
-
 struct getpwsid_state {
        struct winbindd_cli_state *state;
        struct winbindd_domain *domain;