s4:winbind: make use of explicit dcerpc_*_recv functions

metze

diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index 9f851586465d7ce5f0b0c8740fb5822ba22446f0..f23e05d9eb75a7fa5eb6007b048b04d845fddea0 100644 (file)
--- 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 66dcbf9d7bd081e85754e773834b011556e6893a..05f9980be67f0174cdda91cabf608cdb9e11f8da 100644 (file)
--- 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 fe98ce2f6a1a9dd637ea9d9703c8764358975fee..c905ff46168b75dbc807a941d5bc1aefb805cad8 100644 (file)
--- 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 b414cf631305a1a501384ec4451d3df37e16be84..cc541ef6e57ea51bec285013eb0740ab4377b1d0 100644 (file)
--- 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 1b9baecc3678efb7f9a237455a3a2b08c6f7a83d..31c3d039e7cec44d16cbeec1f46e6dd8f4a04148 100644 (file)
--- 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 f8512cec048af7d75e7b3251cd499f5ee094e1c6..7f141372979277aa6f4abe5221698345282e5782 100644 (file)
--- 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 5730acda40b8805a6bd862cac3fb9458acd54df2..24d59daa94c647661851f6feb56f463f91d9d89c 100644 (file)
--- 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 ae3666ff0a5d7772d41235a80153383b8f2b1d4d..40f8dc7358ede928e69be6635db6fb83c3e305f1 100644 (file)
--- 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 c924b0e4cd2351345fbf7ab7a8cb25fdf9f2ed4a..ec449b8f5b3ed4f1f59f384312eca8a30d4a11f4 100644 (file)
--- 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;