From 598cf9f5097aafac95c9e9b420b849ad6090c30e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 27 Feb 2010 10:59:14 +0100 Subject: s4:winbind: make use of explicit dcerpc_*_recv functions metze --- source4/winbind/wb_async_helpers.c | 10 +++++----- source4/winbind/wb_cmd_getdcname.c | 2 +- source4/winbind/wb_cmd_list_trustdom.c | 2 +- source4/winbind/wb_cmd_usersids.c | 2 +- source4/winbind/wb_connect_lsa.c | 2 +- source4/winbind/wb_connect_sam.c | 4 ++-- source4/winbind/wb_dom_info_trusted.c | 6 +++--- source4/winbind/wb_init_domain.c | 4 ++-- source4/winbind/wb_sam_logon.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c index 9f85158646..f23e05d9eb 100644 --- a/source4/winbind/wb_async_helpers.c +++ b/source4/winbind/wb_async_helpers.c @@ -107,7 +107,7 @@ static void lsa_lookupsids_recv_names(struct rpc_request *req) struct lsa_lookupsids_state); int i; - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_lsa_LookupSids_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->r.out.result; if (!NT_STATUS_IS_OK(state->ctx->status) && @@ -256,7 +256,7 @@ static void lsa_lookupnames_recv_sids(struct rpc_request *req) struct lsa_lookupnames_state); int i; - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_lsa_LookupNames_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->r.out.result; if (!NT_STATUS_IS_OK(state->ctx->status) && @@ -376,7 +376,7 @@ static void samr_usergroups_recv_open(struct rpc_request *req) talloc_get_type(req->async.private_data, struct samr_getuserdomgroups_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_samr_OpenUser_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->o.out.result; if (!composite_is_ok(state->ctx)) return; @@ -396,7 +396,7 @@ static void samr_usergroups_recv_groups(struct rpc_request *req) talloc_get_type(req->async.private_data, struct samr_getuserdomgroups_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_samr_GetGroupsForUser_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->g.out.result; if (!composite_is_ok(state->ctx)) return; @@ -415,7 +415,7 @@ static void samr_usergroups_recv_close(struct rpc_request *req) talloc_get_type(req->async.private_data, struct samr_getuserdomgroups_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_samr_Close_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->c.out.result; if (!composite_is_ok(state->ctx)) return; diff --git a/source4/winbind/wb_cmd_getdcname.c b/source4/winbind/wb_cmd_getdcname.c index 66dcbf9d7b..05f9980be6 100644 --- a/source4/winbind/wb_cmd_getdcname.c +++ b/source4/winbind/wb_cmd_getdcname.c @@ -96,7 +96,7 @@ static void getdcname_recv_dcname(struct rpc_request *req) talloc_get_type(req->async.private_data, struct cmd_getdcname_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_netr_GetAnyDCName_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = werror_to_ntstatus(state->g.out.result); if (!composite_is_ok(state->ctx)) return; diff --git a/source4/winbind/wb_cmd_list_trustdom.c b/source4/winbind/wb_cmd_list_trustdom.c index fe98ce2f6a..c905ff4616 100644 --- a/source4/winbind/wb_cmd_list_trustdom.c +++ b/source4/winbind/wb_cmd_list_trustdom.c @@ -126,7 +126,7 @@ static void cmd_list_trustdoms_recv_doms(struct rpc_request *req) struct cmd_list_trustdom_state); int i, old_num_domains; - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_lsa_EnumTrustDom_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->r.out.result; diff --git a/source4/winbind/wb_cmd_usersids.c b/source4/winbind/wb_cmd_usersids.c index b414cf6313..cc541ef6e5 100644 --- a/source4/winbind/wb_cmd_usersids.c +++ b/source4/winbind/wb_cmd_usersids.c @@ -138,7 +138,7 @@ static void usersids_recv_aliases(struct rpc_request *req) struct cmd_usersids_state); int i; - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_samr_GetAliasMembership_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->r.out.result; if (!composite_is_ok(state->ctx)) return; diff --git a/source4/winbind/wb_connect_lsa.c b/source4/winbind/wb_connect_lsa.c index 1b9baecc36..31c3d039e7 100644 --- a/source4/winbind/wb_connect_lsa.c +++ b/source4/winbind/wb_connect_lsa.c @@ -107,7 +107,7 @@ static void init_lsa_recv_openpol(struct rpc_request *req) talloc_get_type(req->async.private_data, struct init_lsa_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_lsa_OpenPolicy2_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->openpolicy.out.result; if (!composite_is_ok(state->ctx)) return; diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c index f8512cec04..7f14137297 100644 --- a/source4/winbind/wb_connect_sam.c +++ b/source4/winbind/wb_connect_sam.c @@ -110,7 +110,7 @@ static void connect_samr_recv_conn(struct rpc_request *req) talloc_get_type(req->async.private_data, struct connect_samr_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_samr_Connect2_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->c.out.result; if (!composite_is_ok(state->ctx)) return; @@ -134,7 +134,7 @@ static void connect_samr_recv_open(struct rpc_request *req) talloc_get_type(req->async.private_data, struct connect_samr_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_samr_OpenDomain_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->o.out.result; if (!composite_is_ok(state->ctx)) return; diff --git a/source4/winbind/wb_dom_info_trusted.c b/source4/winbind/wb_dom_info_trusted.c index 5730acda40..24d59daa94 100644 --- a/source4/winbind/wb_dom_info_trusted.c +++ b/source4/winbind/wb_dom_info_trusted.c @@ -122,9 +122,9 @@ static void trusted_dom_info_recv_dsr(struct rpc_request *req) talloc_get_type(req->async.private_data, struct trusted_dom_info_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_netr_DsRGetDCName_recv(req); if (!NT_STATUS_IS_OK(state->ctx->status)) { - DEBUG(9, ("dcerpc_ndr_request_recv returned %s\n", + DEBUG(9, ("dcerpc_netr_DsRGetDCName_recv returned %s\n", nt_errstr(state->ctx->status))); goto fallback; } @@ -180,7 +180,7 @@ static void trusted_dom_info_recv_dcname(struct rpc_request *req) struct composite_context *ctx; struct nbt_name name; - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_netr_GetAnyDCName_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = werror_to_ntstatus(state->g.out.result); if (!composite_is_ok(state->ctx)) return; diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index ae3666ff0a..40f8dc7358 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -309,7 +309,7 @@ static void init_domain_recv_lsa_policy(struct rpc_request *req) talloc_get_type(req->async.private_data, struct init_domain_state); - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_lsa_OpenPolicy2_recv(req); if ((!NT_STATUS_IS_OK(state->ctx->status) || !NT_STATUS_IS_OK(state->lsa_openpolicy.out.result))) { if (retry_with_schannel(state, state->domain->lsa_binding, @@ -342,7 +342,7 @@ static void init_domain_recv_queryinfo(struct rpc_request *req) struct lsa_DomainInfo *dominfo; struct composite_context *ctx; - state->ctx->status = dcerpc_ndr_request_recv(req); + state->ctx->status = dcerpc_lsa_QueryInfoPolicy_recv(req); if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->queryinfo.out.result; if (!composite_is_ok(state->ctx)) return; diff --git a/source4/winbind/wb_sam_logon.c b/source4/winbind/wb_sam_logon.c index c924b0e4cd..ec449b8f5b 100644 --- a/source4/winbind/wb_sam_logon.c +++ b/source4/winbind/wb_sam_logon.c @@ -126,7 +126,7 @@ static void wb_sam_logon_recv_samlogon(struct rpc_request *req) struct wb_sam_logon_state *s = talloc_get_type(req->async.private_data, struct wb_sam_logon_state); - s->ctx->status = dcerpc_ndr_request_recv(req); + s->ctx->status = dcerpc_netr_LogonSamLogon_recv(req); if (!composite_is_ok(s->ctx)) return; s->ctx->status = s->r.out.result; -- cgit