s3:winbindd: use dcerpc_wbint_* functions instead of rpccli_wbint_*

metze

23 files changed, 71 insertions, 71 deletions

diff --git a/source3/winbindd/wb_dsgetdcname.c b/source3/winbindd/wb_dsgetdcname.c
index 994d14e264..2208135734 100644
--- a/source3/winbindd/wb_dsgetdcname.c
+++ b/source3/winbindd/wb_dsgetdcname.c
@@ -73,8 +73,8 @@ struct tevent_req *wb_dsgetdcname_send(TALLOC_CTX *mem_ctx,
 		guid_ptr = &guid;
 	}
 
-	subreq = rpccli_wbint_DsGetDcName_send(
-		state, ev, child->rpccli, domain_name, guid_ptr, site_name,
+	subreq = dcerpc_wbint_DsGetDcName_send(
+		state, ev, child->binding_handle, domain_name, guid_ptr, site_name,
 		flags, &state->dcinfo);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -91,7 +91,7 @@ static void wb_dsgetdcname_done(struct tevent_req *subreq)
 		req, struct wb_dsgetdcname_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_DsGetDcName_recv(subreq, state, &result);
+	status = dcerpc_wbint_DsGetDcName_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_gid2sid.c b/source3/winbindd/wb_gid2sid.c
index a0ae850ef8..0937590a52 100644
--- a/source3/winbindd/wb_gid2sid.c
+++ b/source3/winbindd/wb_gid2sid.c
@@ -74,8 +74,8 @@ struct tevent_req *wb_gid2sid_send(TALLOC_CTX *mem_ctx,
 
 	child = idmap_child();
 
-	subreq = rpccli_wbint_Gid2Sid_send(
-		state, ev, child->rpccli, state->dom_name,
+	subreq = dcerpc_wbint_Gid2Sid_send(
+		state, ev, child->binding_handle, state->dom_name,
 		gid, &state->sid);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -92,7 +92,7 @@ static void wb_gid2sid_done(struct tevent_req *subreq)
 		req, struct wb_gid2sid_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_Gid2Sid_recv(subreq, state, &result);
+	status = dcerpc_wbint_Gid2Sid_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c
index 2649926d73..c01bc5d211 100644
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -71,8 +71,8 @@ static struct tevent_req *wb_lookupgroupmem_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_LookupGroupMembers_send(
-		state, ev, domain->child.rpccli, &state->sid, type,
+	subreq = dcerpc_wbint_LookupGroupMembers_send(
+		state, ev, domain->child.binding_handle, &state->sid, type,
 		&state->members);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -89,7 +89,7 @@ static void wb_lookupgroupmem_done(struct tevent_req *subreq)
 		req, struct wb_lookupgroupmem_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_LookupGroupMembers_recv(subreq, state, &result);
+	status = dcerpc_wbint_LookupGroupMembers_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_lookupname.c b/source3/winbindd/wb_lookupname.c
index 6251d030be..564616eaed 100644
--- a/source3/winbindd/wb_lookupname.c
+++ b/source3/winbindd/wb_lookupname.c
@@ -68,8 +68,8 @@ struct tevent_req *wb_lookupname_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_LookupName_send(
-		state, ev, domain->child.rpccli, state->dom_name, state->name,
+	subreq = dcerpc_wbint_LookupName_send(
+		state, ev, domain->child.binding_handle, state->dom_name, state->name,
 		flags, &state->type, &state->sid);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -87,7 +87,7 @@ static void wb_lookupname_done(struct tevent_req *subreq)
 	struct winbindd_domain *root_domain;
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_LookupName_recv(subreq, state, &result);
+	status = dcerpc_wbint_LookupName_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
@@ -109,8 +109,8 @@ static void wb_lookupname_done(struct tevent_req *subreq)
 		return;
 	}
 
-	subreq = rpccli_wbint_LookupName_send(
-		state, state->ev, root_domain->child.rpccli, state->dom_name,
+	subreq = dcerpc_wbint_LookupName_send(
+		state, state->ev, root_domain->child.binding_handle, state->dom_name,
 		state->name, state->flags, &state->type, &state->sid);
 	if (tevent_req_nomem(subreq, req)) {
 		return;
@@ -126,7 +126,7 @@ static void wb_lookupname_root_done(struct tevent_req *subreq)
 		req, struct wb_lookupname_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_LookupName_recv(subreq, state, &result);
+	status = dcerpc_wbint_LookupName_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_lookupsid.c b/source3/winbindd/wb_lookupsid.c
index 80e0b80ca1..6fe8a65c37 100644
--- a/source3/winbindd/wb_lookupsid.c
+++ b/source3/winbindd/wb_lookupsid.c
@@ -54,8 +54,8 @@ struct tevent_req *wb_lookupsid_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_LookupSid_send(
-		state, ev, state->lookup_domain->child.rpccli,
+	subreq = dcerpc_wbint_LookupSid_send(
+		state, ev, state->lookup_domain->child.binding_handle,
 		&state->sid, &state->type, &state->domname, &state->name);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -73,7 +73,7 @@ static void wb_lookupsid_done(struct tevent_req *subreq)
 	struct winbindd_domain *forest_root;
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_LookupSid_recv(subreq, state, &result);
+	status = dcerpc_wbint_LookupSid_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
@@ -94,8 +94,8 @@ static void wb_lookupsid_done(struct tevent_req *subreq)
 	}
 	state->lookup_domain = forest_root;
 
-	subreq = rpccli_wbint_LookupSid_send(
-		state, state->ev, state->lookup_domain->child.rpccli,
+	subreq = dcerpc_wbint_LookupSid_send(
+		state, state->ev, state->lookup_domain->child.binding_handle,
 		&state->sid, &state->type, &state->domname, &state->name);
 	if (tevent_req_nomem(subreq, req)) {
 		return;
diff --git a/source3/winbindd/wb_lookupuseraliases.c b/source3/winbindd/wb_lookupuseraliases.c
index 138eca9a81..d8f8023b66 100644
--- a/source3/winbindd/wb_lookupuseraliases.c
+++ b/source3/winbindd/wb_lookupuseraliases.c
@@ -46,8 +46,8 @@ struct tevent_req *wb_lookupuseraliases_send(TALLOC_CTX *mem_ctx,
 	state->sids.num_sids = num_sids;
 	state->sids.sids = CONST_DISCARD(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, domain->child.binding_handle, &state->sids, &state->rids);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -63,7 +63,7 @@ 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)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c
index 99c75b6060..3970daa5ac 100644
--- a/source3/winbindd/wb_lookupusergroups.c
+++ b/source3/winbindd/wb_lookupusergroups.c
@@ -44,8 +44,8 @@ struct tevent_req *wb_lookupusergroups_send(TALLOC_CTX *mem_ctx,
 	}
 	sid_copy(&state->sid, sid);
 
-	subreq = rpccli_wbint_LookupUserGroups_send(
-		state, ev, domain->child.rpccli, &state->sid, &state->sids);
+	subreq = dcerpc_wbint_LookupUserGroups_send(
+		state, ev, domain->child.binding_handle, &state->sid, &state->sids);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -61,7 +61,7 @@ static void wb_lookupusergroups_done(struct tevent_req *subreq)
 		req, struct wb_lookupusergroups_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_LookupUserGroups_recv(subreq, state, &result);
+	status = dcerpc_wbint_LookupUserGroups_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
index d05370038b..523f8cda8a 100644
--- a/source3/winbindd/wb_next_grent.c
+++ b/source3/winbindd/wb_next_grent.c
@@ -69,8 +69,8 @@ struct tevent_req *wb_next_grent_send(TALLOC_CTX *mem_ctx,
 			tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
 			return tevent_req_post(req, ev);
 		}
-		subreq = rpccli_wbint_QueryGroupList_send(
-			state, state->ev, state->gstate->domain->child.rpccli,
+		subreq = dcerpc_wbint_QueryGroupList_send(
+			state, state->ev, state->gstate->domain->child.binding_handle,
 			&state->next_groups);
 		if (tevent_req_nomem(subreq, req)) {
 			return tevent_req_post(req, ev);
@@ -98,7 +98,7 @@ static void wb_next_grent_fetch_done(struct tevent_req *subreq)
 		req, struct wb_next_grent_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_QueryGroupList_recv(subreq, state, &result);
+	status = dcerpc_wbint_QueryGroupList_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status) || !NT_STATUS_IS_OK(result)) {
 		/* Ignore errors here, just log it */
@@ -125,8 +125,8 @@ static void wb_next_grent_fetch_done(struct tevent_req *subreq)
 			tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
 			return;
 		}
-		subreq = rpccli_wbint_QueryGroupList_send(
-			state, state->ev, state->gstate->domain->child.rpccli,
+		subreq = dcerpc_wbint_QueryGroupList_send(
+			state, state->ev, state->gstate->domain->child.binding_handle,
 			&state->next_groups);
 		if (tevent_req_nomem(subreq, req)) {
 			return;
diff --git a/source3/winbindd/wb_query_user_list.c b/source3/winbindd/wb_query_user_list.c
index d7c9b7f5ad..5480763890 100644
--- a/source3/winbindd/wb_query_user_list.c
+++ b/source3/winbindd/wb_query_user_list.c
@@ -40,8 +40,8 @@ struct tevent_req *wb_query_user_list_send(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	subreq = rpccli_wbint_QueryUserList_send(state, ev,
-						 domain->child.rpccli,
+	subreq = dcerpc_wbint_QueryUserList_send(state, ev,
+						 domain->child.binding_handle,
 						 &state->users);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -58,7 +58,7 @@ static void wb_query_user_list_done(struct tevent_req *subreq)
 		req, struct wb_query_user_list_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_QueryUserList_recv(subreq, state, &result);
+	status = dcerpc_wbint_QueryUserList_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
@@ -69,7 +69,7 @@ static void wb_query_user_list_done(struct tevent_req *subreq)
 		return;
 	}
 
-	DEBUG(10, ("rpccli_wbint_QueryUserList returned %d users\n",
+	DEBUG(10, ("dcerpc_wbint_QueryUserList returned %d users\n",
 		   state->users.num_userinfos));
 
 	tevent_req_done(req);
diff --git a/source3/winbindd/wb_queryuser.c b/source3/winbindd/wb_queryuser.c
index d85af78f3e..b7d6af846c 100644
--- a/source3/winbindd/wb_queryuser.c
+++ b/source3/winbindd/wb_queryuser.c
@@ -53,7 +53,7 @@ struct tevent_req *wb_queryuser_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_QueryUser_send(state, ev, domain->child.rpccli,
+	subreq = dcerpc_wbint_QueryUser_send(state, ev, domain->child.binding_handle,
 					     &state->sid, state->info);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -70,7 +70,7 @@ static void wb_queryuser_done(struct tevent_req *subreq)
 		req, struct wb_queryuser_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_QueryUser_recv(subreq, state->info, &result);
+	status = dcerpc_wbint_QueryUser_recv(subreq, state->info, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_seqnum.c b/source3/winbindd/wb_seqnum.c
index 111150eddd..3084564a33 100644
--- a/source3/winbindd/wb_seqnum.c
+++ b/source3/winbindd/wb_seqnum.c
@@ -38,8 +38,8 @@ struct tevent_req *wb_seqnum_send(TALLOC_CTX *mem_ctx,
 	if (req == NULL) {
 		return NULL;
 	}
-	subreq = rpccli_wbint_QuerySequenceNumber_send(
-		state, ev, domain->child.rpccli, &state->seqnum);
+	subreq = dcerpc_wbint_QuerySequenceNumber_send(
+		state, ev, domain->child.binding_handle, &state->seqnum);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -55,7 +55,7 @@ static void wb_seqnum_done(struct tevent_req *subreq)
 		req, struct wb_seqnum_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_QuerySequenceNumber_recv(subreq, state, &result);
+	status = dcerpc_wbint_QuerySequenceNumber_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_sid2gid.c b/source3/winbindd/wb_sid2gid.c
index e15d563cd7..4d76d69297 100644
--- a/source3/winbindd/wb_sid2gid.c
+++ b/source3/winbindd/wb_sid2gid.c
@@ -124,7 +124,7 @@ static void wb_sid2gid_lookup_done(struct tevent_req *subreq)
 
 	child = idmap_child();
 
-	subreq = rpccli_wbint_Sid2Gid_send(state, state->ev, child->rpccli,
+	subreq = dcerpc_wbint_Sid2Gid_send(state, state->ev, child->binding_handle,
 					   state->dom_name, &state->sid,
 					   &state->gid64);
 	if (tevent_req_nomem(subreq, req)) {
@@ -141,7 +141,7 @@ static void wb_sid2gid_done(struct tevent_req *subreq)
 		req, struct wb_sid2gid_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_Sid2Gid_recv(subreq, state, &result);
+	status = dcerpc_wbint_Sid2Gid_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_sid2uid.c b/source3/winbindd/wb_sid2uid.c
index 9c22b8d10b..86bf5d4641 100644
--- a/source3/winbindd/wb_sid2uid.c
+++ b/source3/winbindd/wb_sid2uid.c
@@ -122,7 +122,7 @@ static void wb_sid2uid_lookup_done(struct tevent_req *subreq)
 
 	child = idmap_child();
 
-	subreq = rpccli_wbint_Sid2Uid_send(state, state->ev, child->rpccli,
+	subreq = dcerpc_wbint_Sid2Uid_send(state, state->ev, child->binding_handle,
 					   state->dom_name, &state->sid,
 					   &state->uid64);
 	if (tevent_req_nomem(subreq, req)) {
@@ -139,7 +139,7 @@ static void wb_sid2uid_done(struct tevent_req *subreq)
 		req, struct wb_sid2uid_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_Sid2Uid_recv(subreq, state, &result);
+	status = dcerpc_wbint_Sid2Uid_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/wb_uid2sid.c b/source3/winbindd/wb_uid2sid.c
index 18ef3b214a..9e86fd5a01 100644
--- a/source3/winbindd/wb_uid2sid.c
+++ b/source3/winbindd/wb_uid2sid.c
@@ -74,8 +74,8 @@ struct tevent_req *wb_uid2sid_send(TALLOC_CTX *mem_ctx,
 
 	child = idmap_child();
 
-	subreq = rpccli_wbint_Uid2Sid_send(
-		state, ev, child->rpccli, state->dom_name,
+	subreq = dcerpc_wbint_Uid2Sid_send(
+		state, ev, child->binding_handle, state->dom_name,
 		uid, &state->sid);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -92,7 +92,7 @@ static void wb_uid2sid_done(struct tevent_req *subreq)
 		req, struct wb_uid2sid_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_Uid2Sid_recv(subreq, state, &result);
+	status = dcerpc_wbint_Uid2Sid_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/winbindd_allocate_gid.c b/source3/winbindd/winbindd_allocate_gid.c
index 868a5cc405..d9264543cb 100644
--- a/source3/winbindd/winbindd_allocate_gid.c
+++ b/source3/winbindd/winbindd_allocate_gid.c
@@ -46,7 +46,7 @@ struct tevent_req *winbindd_allocate_gid_send(TALLOC_CTX *mem_ctx,
 
 	child = idmap_child();
 
-	subreq = rpccli_wbint_AllocateGid_send(state, ev, child->rpccli,
+	subreq = dcerpc_wbint_AllocateGid_send(state, ev, child->binding_handle,
 					       &state->gid);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -63,7 +63,7 @@ static void winbindd_allocate_gid_done(struct tevent_req *subreq)
 		req, struct winbindd_allocate_gid_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_AllocateGid_recv(subreq, state, &result);
+	status = dcerpc_wbint_AllocateGid_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/winbindd_allocate_uid.c b/source3/winbindd/winbindd_allocate_uid.c
index 171d0ccb91..b949b4a860 100644
--- a/source3/winbindd/winbindd_allocate_uid.c
+++ b/source3/winbindd/winbindd_allocate_uid.c
@@ -46,7 +46,7 @@ struct tevent_req *winbindd_allocate_uid_send(TALLOC_CTX *mem_ctx,
 
 	child = idmap_child();
 
-	subreq = rpccli_wbint_AllocateUid_send(state, ev, child->rpccli,
+	subreq = dcerpc_wbint_AllocateUid_send(state, ev, child->binding_handle,
 					       &state->uid);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -63,7 +63,7 @@ static void winbindd_allocate_uid_done(struct tevent_req *subreq)
 		req, struct winbindd_allocate_uid_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_AllocateUid_recv(subreq, state, &result);
+	status = dcerpc_wbint_AllocateUid_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/winbindd_change_machine_acct.c b/source3/winbindd/winbindd_change_machine_acct.c
index a49315d1be..8b31bb1f93 100644
--- a/source3/winbindd/winbindd_change_machine_acct.c
+++ b/source3/winbindd/winbindd_change_machine_acct.c
@@ -57,8 +57,8 @@ struct tevent_req *winbindd_change_machine_acct_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_ChangeMachineAccount_send(state, ev,
-							domain->child.rpccli);
+	subreq = dcerpc_wbint_ChangeMachineAccount_send(state, ev,
+							domain->child.binding_handle);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -74,7 +74,7 @@ static void winbindd_change_machine_acct_done(struct tevent_req *subreq)
 		req, struct winbindd_change_machine_acct_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_ChangeMachineAccount_recv(subreq, state, &result);
+	status = dcerpc_wbint_ChangeMachineAccount_recv(subreq, state, &result);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
 		return;
diff --git a/source3/winbindd/winbindd_check_machine_acct.c b/source3/winbindd/winbindd_check_machine_acct.c
index 57595c18e0..65a975002b 100644
--- a/source3/winbindd/winbindd_check_machine_acct.c
+++ b/source3/winbindd/winbindd_check_machine_acct.c
@@ -61,8 +61,8 @@ struct tevent_req *winbindd_check_machine_acct_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_CheckMachineAccount_send(state, ev,
-						       domain->child.rpccli);
+	subreq = dcerpc_wbint_CheckMachineAccount_send(state, ev,
+						       domain->child.binding_handle);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -78,7 +78,7 @@ static void winbindd_check_machine_acct_done(struct tevent_req *subreq)
 		req, struct winbindd_check_machine_acct_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_CheckMachineAccount_recv(subreq, state, &result);
+	status = dcerpc_wbint_CheckMachineAccount_recv(subreq, state, &result);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
 		return;
diff --git a/source3/winbindd/winbindd_dsgetdcname.c b/source3/winbindd/winbindd_dsgetdcname.c
index 2c475d8f4e..f01d35428e 100644
--- a/source3/winbindd/winbindd_dsgetdcname.c
+++ b/source3/winbindd/winbindd_dsgetdcname.c
@@ -67,8 +67,8 @@ struct tevent_req *winbindd_dsgetdcname_send(TALLOC_CTX *mem_ctx,
 
 	child = locator_child();
 
-	subreq = rpccli_wbint_DsGetDcName_send(
-		state, ev, child->rpccli,
+	subreq = dcerpc_wbint_DsGetDcName_send(
+		state, ev, child->binding_handle,
 		request->data.dsgetdcname.domain_name, guid_ptr,
 		request->data.dsgetdcname.site_name,
 		ds_flags, &state->dc_info);
@@ -87,7 +87,7 @@ static void winbindd_dsgetdcname_done(struct tevent_req *subreq)
 		req, struct winbindd_dsgetdcname_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_DsGetDcName_recv(subreq, state, &result);
+	status = dcerpc_wbint_DsGetDcName_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/winbindd_list_groups.c b/source3/winbindd/winbindd_list_groups.c
index 7331e9da1e..e2cbff85a6 100644
--- a/source3/winbindd/winbindd_list_groups.c
+++ b/source3/winbindd/winbindd_list_groups.c
@@ -90,8 +90,8 @@ struct tevent_req *winbindd_list_groups_send(TALLOC_CTX *mem_ctx,
 	for (i=0; i<state->num_domains; i++) {
 		struct winbindd_list_groups_domstate *d = &state->domains[i];
 
-		d->subreq = rpccli_wbint_QueryGroupList_send(
-			state->domains, ev, d->domain->child.rpccli,
+		d->subreq = dcerpc_wbint_QueryGroupList_send(
+			state->domains, ev, d->domain->child.binding_handle,
 			&d->groups);
 		if (tevent_req_nomem(d->subreq, req)) {
 			TALLOC_FREE(state->domains);
@@ -113,7 +113,7 @@ static void winbindd_list_groups_done(struct tevent_req *subreq)
 	NTSTATUS status, result;
 	int i;
 
-	status = rpccli_wbint_QueryGroupList_recv(subreq, state->domains,
+	status = dcerpc_wbint_QueryGroupList_recv(subreq, state->domains,
 						  &result);
 
 	for (i=0; i<state->num_domains; i++) {
diff --git a/source3/winbindd/winbindd_list_users.c b/source3/winbindd/winbindd_list_users.c
index 124e71b039..160df7917a 100644
--- a/source3/winbindd/winbindd_list_users.c
+++ b/source3/winbindd/winbindd_list_users.c
@@ -90,8 +90,8 @@ struct tevent_req *winbindd_list_users_send(TALLOC_CTX *mem_ctx,
 	for (i=0; i<state->num_domains; i++) {
 		struct winbindd_list_users_domstate *d = &state->domains[i];
 
-		d->subreq = rpccli_wbint_QueryUserList_send(
-			state->domains, ev, d->domain->child.rpccli,
+		d->subreq = dcerpc_wbint_QueryUserList_send(
+			state->domains, ev, d->domain->child.binding_handle,
 			&d->users);
 		if (tevent_req_nomem(d->subreq, req)) {
 			TALLOC_FREE(state->domains);
@@ -113,7 +113,7 @@ static void winbindd_list_users_done(struct tevent_req *subreq)
 	NTSTATUS status, result;
 	int i;
 
-	status = rpccli_wbint_QueryUserList_recv(subreq, state->domains,
+	status = dcerpc_wbint_QueryUserList_recv(subreq, state->domains,
 						 &result);
 
 	for (i=0; i<state->num_domains; i++) {
diff --git a/source3/winbindd/winbindd_lookuprids.c b/source3/winbindd/winbindd_lookuprids.c
index f2cb8793eb..0889cffc8d 100644
--- a/source3/winbindd/winbindd_lookuprids.c
+++ b/source3/winbindd/winbindd_lookuprids.c
@@ -82,8 +82,8 @@ struct tevent_req *winbindd_lookuprids_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_LookupRids_send(
-		state, ev, domain->child.rpccli, &state->rids, &state->names);
+	subreq = dcerpc_wbint_LookupRids_send(
+		state, ev, domain->child.binding_handle, &state->rids, &state->names);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -99,7 +99,7 @@ static void winbindd_lookuprids_done(struct tevent_req *subreq)
 		req, struct winbindd_lookuprids_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_LookupRids_recv(subreq, state, &result);
+	status = dcerpc_wbint_LookupRids_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
diff --git a/source3/winbindd/winbindd_ping_dc.c b/source3/winbindd/winbindd_ping_dc.c
index e06e5896c2..e69e59399c 100644
--- a/source3/winbindd/winbindd_ping_dc.c
+++ b/source3/winbindd/winbindd_ping_dc.c
@@ -61,7 +61,7 @@ struct tevent_req *winbindd_ping_dc_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	subreq = rpccli_wbint_PingDc_send(state, ev, domain->child.rpccli);
+	subreq = dcerpc_wbint_PingDc_send(state, ev, domain->child.binding_handle);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
@@ -77,7 +77,7 @@ static void winbindd_ping_dc_done(struct tevent_req *subreq)
 		req, struct winbindd_ping_dc_state);
 	NTSTATUS status, result;
 
-	status = rpccli_wbint_PingDc_recv(subreq, state, &result);
+	status = dcerpc_wbint_PingDc_recv(subreq, state, &result);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
 		return;