winbind: Remove unused wbint_Uid2Sid

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/librpc/idl/winbind.idl b/librpc/idl/winbind.idl
index 7150e3f49b4dbafb2930afd2c654fd15fd05cdb0..e4288e2c1d2f5187e2e2e1489bfca7283367b64e 100644 (file)
--- a/librpc/idl/winbind.idl
+++ b/librpc/idl/winbind.idl
@@ -56,11 +56,6 @@ interface winbind
        [in,out] wbint_TransIDArray *ids
        );
 
-    NTSTATUS wbint_Uid2Sid(
-       [in] hyper uid,
-       [out] dom_sid *sid
-       );
-
     NTSTATUS wbint_Gid2Sid(
        [in] hyper gid,
        [out] dom_sid *sid

diff --git a/source3/winbindd/wb_uid2sid.c b/source3/winbindd/wb_uid2sid.c
deleted file mode 100644 (file)
index c95bcd9..0000000
--- a/source3/winbindd/wb_uid2sid.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   async uid2sid
-   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 "librpc/gen_ndr/ndr_winbind_c.h"
-#include "idmap_cache.h"
-#include "idmap.h"
-#include "../libcli/security/security.h"
-
-struct wb_uid2sid_state {
-       struct tevent_context *ev;
-       struct dom_sid sid;
-};
-
-static void wb_uid2sid_done(struct tevent_req *subreq);
-
-struct tevent_req *wb_uid2sid_send(TALLOC_CTX *mem_ctx,
-                                  struct tevent_context *ev,
-                                  uid_t uid)
-{
-       struct tevent_req *req, *subreq;
-       struct wb_uid2sid_state *state;
-       struct winbindd_child *child;
-       bool expired;
-
-       req = tevent_req_create(mem_ctx, &state, struct wb_uid2sid_state);
-       if (req == NULL) {
-               return NULL;
-       }
-
-       if (winbindd_use_idmap_cache()
-           && idmap_cache_find_uid2sid(uid, &state->sid, &expired)) {
-
-               DEBUG(10, ("idmap_cache_find_uid2sid found %d%s\n",
-                          (int)uid, expired ? " (expired)": ""));
-
-               if (!expired || idmap_is_offline()) {
-                       if (is_null_sid(&state->sid)) {
-                               tevent_req_nterror(req,
-                                                  NT_STATUS_NONE_MAPPED);
-                       } else {
-                               tevent_req_done(req);
-                       }
-                       return tevent_req_post(req, ev);
-               }
-       }
-
-       child = idmap_child();
-
-       subreq = dcerpc_wbint_Uid2Sid_send(
-               state, ev, child->binding_handle,
-               uid, &state->sid);
-       if (tevent_req_nomem(subreq, req)) {
-               return tevent_req_post(req, ev);
-       }
-       tevent_req_set_callback(subreq, wb_uid2sid_done, req);
-       return req;
-}
-
-static void wb_uid2sid_done(struct tevent_req *subreq)
-{
-       struct tevent_req *req = tevent_req_callback_data(
-               subreq, struct tevent_req);
-       struct wb_uid2sid_state *state = tevent_req_data(
-               req, struct wb_uid2sid_state);
-       NTSTATUS status, result;
-
-       status = dcerpc_wbint_Uid2Sid_recv(subreq, state, &result);
-       TALLOC_FREE(subreq);
-       if (any_nt_status_not_ok(status, result, &status)) {
-               tevent_req_nterror(req, status);
-               return;
-       }
-       tevent_req_done(req);
-}
-
-NTSTATUS wb_uid2sid_recv(struct tevent_req *req, struct dom_sid *sid)
-{
-       struct wb_uid2sid_state *state = tevent_req_data(
-               req, struct wb_uid2sid_state);
-       NTSTATUS status;
-
-       if (tevent_req_is_nterror(req, &status)) {
-               return status;
-       }
-       sid_copy(sid, &state->sid);
-       return NT_STATUS_OK;
-}

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index d60707078ae78139f2a342345dc5ff39f23cf3ce..4d6c3d1ba9fe122f118874f0ba1ebfb620efd58e 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -222,11 +222,6 @@ done:
        return status;
 }
 
-NTSTATUS _wbint_Uid2Sid(struct pipes_struct *p, struct wbint_Uid2Sid *r)
-{
-       return idmap_uid_to_sid(r->out.sid, r->in.uid);
-}
-
 NTSTATUS _wbint_Gid2Sid(struct pipes_struct *p, struct wbint_Gid2Sid *r)
 {
        return idmap_gid_to_sid(r->out.sid, r->in.gid);

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 063e7930b2534773aced94601b2dd76f7f4b67fe..4cce2d1b57be73b19b098a16e5fe4b5d134cb20d 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -539,11 +539,6 @@ struct tevent_req *winbindd_sid_to_gid_send(TALLOC_CTX *mem_ctx,
 NTSTATUS winbindd_sid_to_gid_recv(struct tevent_req *req,
                                  struct winbindd_response *response);
 
-struct tevent_req *wb_uid2sid_send(TALLOC_CTX *mem_ctx,
-                                  struct tevent_context *ev,
-                                  uid_t uid);
-NTSTATUS wb_uid2sid_recv(struct tevent_req *req, struct dom_sid *sid);
-
 struct tevent_req *winbindd_uid_to_sid_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct winbindd_cli_state *cli,

diff --git a/source3/wscript_build b/source3/wscript_build
index a14551f0577325a8181a2fdc02217b7920c71d4e..ad5f3b4b96460482d3b9d7d8423b43e632438cc7 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -924,7 +924,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  winbindd/wb_lookupsid.c
                  winbindd/wb_lookupsids.c
                  winbindd/wb_lookupname.c
-                 winbindd/wb_uid2sid.c
                  winbindd/wb_gid2sid.c
                  winbindd/wb_sids2xids.c
                  winbindd/wb_xids2sids.c