X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Fwinbindd%2Fwb_lookupuseraliases.c;h=9a5794fb6ad208d51cd09e15b1587113dbd25e2c;hb=7736e592ffd0664c75a9c9c5c476b3cc9ed1de75;hp=e2e5e2da080cfaa93f2ece2bef81fb01804f3d7d;hpb=ce42ea3ab8c69a3f650d4c9bc787e4805aad928d;p=sfrench%2Fsamba-autobuild%2F.git

diff --git a/source3/winbindd/wb_lookupuseraliases.c b/source3/winbindd/wb_lookupuseraliases.c
index e2e5e2da080..9a5794fb6ad 100644
--- a/source3/winbindd/wb_lookupuseraliases.c
+++ b/source3/winbindd/wb_lookupuseraliases.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/cli_wbint.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct wb_lookupuseraliases_state {
 	struct tevent_context *ev;
@@ -37,7 +37,6 @@ struct tevent_req *wb_lookupuseraliases_send(TALLOC_CTX *mem_ctx,
 {
 	struct tevent_req *req, *subreq;
 	struct wb_lookupuseraliases_state *state;
-	NTSTATUS status;
 
 	req = tevent_req_create(mem_ctx, &state,
 				struct wb_lookupuseraliases_state);
@@ -45,18 +44,10 @@ struct tevent_req *wb_lookupuseraliases_send(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 	state->sids.num_sids = num_sids;
-	state->sids.sids = CONST_DISCARD(struct dom_sid *, sids);
-
-	status = wcache_lookup_useraliases(domain, state, num_sids, sids,
-					   &state->rids.num_rids,
-					   &state->rids.rids);
-	if (NT_STATUS_IS_OK(status)) {
-		tevent_req_done(req);
-		return tevent_req_post(req, ev);
-	}
+	state->sids.sids = discard_const_p(struct dom_sid, sids);
 
-	subreq = rpccli_wbint_LookupUserAliases_send(
-		state, ev, domain->child.rpccli, &state->sids, &state->rids);
+	subreq = dcerpc_wbint_LookupUserAliases_send(
+		state, ev, dom_child_handle(domain), &state->sids, &state->rids);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -72,16 +63,12 @@ static void wb_lookupuseraliases_done(struct tevent_req *subreq)
 		req, struct wb_lookupuseraliases_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_LookupUserAliases_recv(subreq, state, &result);
+	status = dcerpc_wbint_LookupUserAliases_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (any_nt_status_not_ok(status, result, &status)) {
 		tevent_req_nterror(req, status);
 		return;
 	}
-	if (!NT_STATUS_IS_OK(result)) {
-		tevent_req_nterror(req, result);
-		return;
-	}
 	tevent_req_done(req);
 }