winbind: Remove unused WINBINDD_UID_TO_SID

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Mon Feb 22 23:39:13 CET 2016 on sn-devel-144

diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h
index 6f25619dfa10e86c6a45498f3c0edb22a3c3773f..622dcfef23204a1374201e9a9e6d5bb366f4cd2e 100644 (file)
--- a/nsswitch/winbind_struct_protocol.h
+++ b/nsswitch/winbind_struct_protocol.h
@@ -57,6 +57,7 @@ typedef char fstring[FSTRING_LEN];
  *     removed WINBINDD_SID_TO_UID
  *     removed WINBINDD_SID_TO_GID
  *     removed WINBINDD_GID_TO_SID
+ *     removed WINBINDD_UID_TO_SID
  */
 #define WINBIND_INTERFACE_VERSION 28
 
@@ -116,7 +117,6 @@ enum winbindd_cmd {
 
        WINBINDD_SIDS_TO_XIDS,
        WINBINDD_XIDS_TO_SIDS,
-       WINBINDD_UID_TO_SID,
 
        WINBINDD_ALLOCATE_UID,
        WINBINDD_ALLOCATE_GID,

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 10b1979d66f3c8200a8d8b27fd4d08c024170cc3..78df632f49800983cb308f09f664c5a4302b22fb 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -608,8 +608,6 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          winbindd_lookupsids_send, winbindd_lookupsids_recv },
        { WINBINDD_LOOKUPNAME, "LOOKUPNAME",
          winbindd_lookupname_send, winbindd_lookupname_recv },
-       { WINBINDD_UID_TO_SID, "UID_TO_SID",
-         winbindd_uid_to_sid_send, winbindd_uid_to_sid_recv },
        { WINBINDD_SIDS_TO_XIDS, "SIDS_TO_XIDS",
          winbindd_sids_to_xids_send, winbindd_sids_to_xids_recv },
        { WINBINDD_XIDS_TO_SIDS, "XIDS_TO_SIDS",

diff --git a/source3/winbindd/winbindd_uid_to_sid.c b/source3/winbindd/winbindd_uid_to_sid.c
deleted file mode 100644 (file)
index d0ea9c6..0000000
--- a/source3/winbindd/winbindd_uid_to_sid.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   async implementation of WINBINDD_UID_TO_SID
-   Copyright (C) Volker Lendecke 2009
-
-   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"
-#include "libcli/security/dom_sid.h"
-
-struct winbindd_uid_to_sid_state {
-       struct tevent_context *ev;
-       struct unixid xid;
-       struct dom_sid *sid;
-};
-
-static void winbindd_uid_to_sid_done(struct tevent_req *subreq);
-
-struct tevent_req *winbindd_uid_to_sid_send(TALLOC_CTX *mem_ctx,
-                                           struct tevent_context *ev,
-                                           struct winbindd_cli_state *cli,
-                                           struct winbindd_request *request)
-{
-       struct tevent_req *req, *subreq;
-       struct winbindd_uid_to_sid_state *state;
-
-       req = tevent_req_create(mem_ctx, &state,
-                               struct winbindd_uid_to_sid_state);
-       if (req == NULL) {
-               return NULL;
-       }
-       state->ev = ev;
-
-       DEBUG(3, ("uid_to_sid %d\n", (int)request->data.uid));
-
-       state->xid = (struct unixid) {
-               .id = request->data.uid, .type = ID_TYPE_UID };
-
-       subreq = wb_xids2sids_send(state, ev, &state->xid, 1);
-       if (tevent_req_nomem(subreq, req)) {
-               return tevent_req_post(req, ev);
-       }
-       tevent_req_set_callback(subreq, winbindd_uid_to_sid_done, req);
-       return req;
-}
-
-static void winbindd_uid_to_sid_done(struct tevent_req *subreq)
-{
-       struct tevent_req *req = tevent_req_callback_data(
-               subreq, struct tevent_req);
-       struct winbindd_uid_to_sid_state *state = tevent_req_data(
-               req, struct winbindd_uid_to_sid_state);
-       NTSTATUS status;
-
-       status = wb_xids2sids_recv(subreq, state, &state->sid);
-       TALLOC_FREE(subreq);
-       if (tevent_req_nterror(req, status)) {
-               return;
-       }
-       tevent_req_done(req);
-}
-
-NTSTATUS winbindd_uid_to_sid_recv(struct tevent_req *req,
-                                 struct winbindd_response *response)
-{
-       struct winbindd_uid_to_sid_state *state = tevent_req_data(
-               req, struct winbindd_uid_to_sid_state);
-       NTSTATUS status;
-
-       if (tevent_req_is_nterror(req, &status)) {
-               DEBUG(5, ("Could not convert sid %s: %s\n",
-                         sid_string_dbg(state->sid), nt_errstr(status)));
-               return status;
-       }
-       if (is_null_sid(state->sid)) {
-               return NT_STATUS_NONE_MAPPED;
-       }
-       sid_to_fstring(response->data.sid.sid, state->sid);
-       response->data.sid.type = SID_NAME_USER;
-       return NT_STATUS_OK;
-}

diff --git a/source3/wscript_build b/source3/wscript_build
index 703042328b4c2836178de3c22a714ad3f514e6c3..9ec11f9892ac757a83c79245aa75cae436fc84fe 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -944,7 +944,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  winbindd/winbindd_lookupsid.c
                  winbindd/winbindd_lookupsids.c
                  winbindd/winbindd_lookupname.c
-                 winbindd/winbindd_uid_to_sid.c
                  winbindd/winbindd_sids_to_xids.c
                  winbindd/winbindd_xids_to_sids.c
                  winbindd/winbindd_allocate_uid.c