s3: Remove unused winbindd_dual_userinfo

(cherry picked from commit 55478de7b54cc940324fd76ea2ec05025dbeeccd)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3fcc48628826a83ab427574d6cc5ea1dd6030b0f..304d432ec5572280d2192d96aa37fda31e48c519 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1146,7 +1146,6 @@ IDMAP_ADEX_OBJ = \
 
 WINBINDD_OBJ1 = \
                winbindd/winbindd.o       \
-               winbindd/winbindd_user.o  \
                winbindd/winbindd_group.o \
                winbindd/winbindd_util.o  \
                winbindd/winbindd_cache.o \

diff --git a/source3/winbindd/winbindd_domain.c b/source3/winbindd/winbindd_domain.c
index ad3d6d7916fd25132767f24dea2b08f42bf72215..bb8e660eb16f6eebfa0244de0fb1b391a9b60053 100644 (file)
--- a/source3/winbindd/winbindd_domain.c
+++ b/source3/winbindd/winbindd_domain.c
@@ -74,10 +74,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/source3/winbindd/winbindd_user.c b/source3/winbindd/winbindd_user.c
deleted file mode 100644 (file)
index 6afa941..0000000
--- a/source3/winbindd/winbindd_user.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Winbind daemon - user related functions
-
-   Copyright (C) Tim Potter 2000
-   Copyright (C) Jeremy Allison 2001.
-   Copyright (C) Gerald (Jerry) Carter 2003.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "winbindd.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_WINBIND
-
-/* 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;
-       struct wbint_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;
-}