winbindd: remove bogus fallback to the forest root in wb_lookupname*()

It's the job of the domain controller in our domain
to traverse the trust chain.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/winbindd/wb_lookupname.c b/source3/winbindd/wb_lookupname.c
index 62b2e477c1a1fd54964eabb7b99e540442a7f80d..1dd6b68334e5573e26ef42a52f235f9b6f2317a7 100644 (file)
--- a/source3/winbindd/wb_lookupname.c
+++ b/source3/winbindd/wb_lookupname.c
@@ -32,7 +32,6 @@ struct wb_lookupname_state {
 };
 
 static void wb_lookupname_done(struct tevent_req *subreq);
-static void wb_lookupname_root_done(struct tevent_req *subreq);
 
 struct tevent_req *wb_lookupname_send(TALLOC_CTX *mem_ctx,
                                      struct tevent_context *ev,
@@ -81,46 +80,6 @@ struct tevent_req *wb_lookupname_send(TALLOC_CTX *mem_ctx,
 }
 
 static void wb_lookupname_done(struct tevent_req *subreq)
-{
-       struct tevent_req *req = tevent_req_callback_data(
-               subreq, struct tevent_req);
-       struct wb_lookupname_state *state = tevent_req_data(
-               req, struct wb_lookupname_state);
-       struct winbindd_domain *root_domain;
-       NTSTATUS status, result;
-
-       status = dcerpc_wbint_LookupName_recv(subreq, state, &result);
-       TALLOC_FREE(subreq);
-       if (tevent_req_nterror(req, status)) {
-               return;
-       }
-       if (NT_STATUS_IS_OK(result)) {
-               tevent_req_done(req);
-               return;
-       }
-
-       /*
-        * "our" DC did not find it, lets retry with the forest root
-        * domain
-        */
-
-       root_domain = find_root_domain();
-       if (root_domain == NULL) {
-               tevent_req_nterror(req, result);
-               return;
-       }
-
-       subreq = dcerpc_wbint_LookupName_send(
-               state, state->ev, dom_child_handle(root_domain),
-               state->dom_name,
-               state->name, state->flags, &state->type, &state->sid);
-       if (tevent_req_nomem(subreq, req)) {
-               return;
-       }
-       tevent_req_set_callback(subreq, wb_lookupname_root_done, req);
-}
-
-static void wb_lookupname_root_done(struct tevent_req *subreq)
 {
        struct tevent_req *req = tevent_req_callback_data(
                subreq, struct tevent_req);