Changeset 745 for trunk/server/source4/libnet/libnet_rpc.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libnet/libnet_rpc.c (modified) (18 diffs)

trunk/server/source4/libnet/libnet_rpc.c

@@ -23 +23 @@
 #include "libcli/libcli.h"
 #include "libcli/composite/composite.h"
-#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_proto.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
@@ -111 +110 @@
         case LIBNET_RPC_CONNECT_SERVER_ADDRESS:
                 b->flags = r->in.dcerpc_flags;
+        }
+
+        if (DEBUGLEVEL >= 10) {
+                b->flags |= DCERPC_DEBUG_PRINT_BOTH;
         }
 
@@ -225 +228 @@
 
 
-static void continue_lookup_dc(struct composite_context *ctx);
+static void continue_lookup_dc(struct tevent_req *req);
 static void continue_rpc_connect(struct composite_context *ctx);
 
@@ -245 +248 @@
         struct composite_context *c;
         struct rpc_connect_dc_state *s;
-        struct composite_context *lookup_dc_req;
+        struct tevent_req *lookup_dc_req;
 
         /* composite context allocation and setup */
@@ -282 +285 @@
         if (composite_nomem(lookup_dc_req, c)) return c;
 
-        composite_continue(c, lookup_dc_req, continue_lookup_dc, c);
+        tevent_req_set_callback(lookup_dc_req, continue_lookup_dc, c);
         return c;
 }
@@ -291 +294 @@
   initiate RpcConnect to it
 */
-static void continue_lookup_dc(struct composite_context *ctx)
+static void continue_lookup_dc(struct tevent_req *req)
 {
         struct composite_context *c;
@@ -298 +301 @@
         struct monitor_msg msg;
         struct msg_net_lookup_dc data;
-        
-        c = talloc_get_type(ctx->async.private_data, struct composite_context);
-        s = talloc_get_type(c->private_data, struct rpc_connect_dc_state);
+
+        c = tevent_req_callback_data(req, struct composite_context);
+        s = talloc_get_type_abort(c->private_data, struct rpc_connect_dc_state);
         
         /* receive result of domain controller lookup */
-        c->status = libnet_LookupDCs_recv(ctx, c, &s->f);
+        c->status = libnet_LookupDCs_recv(req, c, &s->f);
         if (!composite_is_ok(c)) return;
 
@@ -455 +458 @@
 
 static void continue_dci_rpc_connect(struct composite_context *ctx);
-static void continue_lsa_policy(struct rpc_request *req);
-static void continue_lsa_query_info(struct rpc_request *req);
-static void continue_lsa_query_info2(struct rpc_request *req);
+static void continue_lsa_policy(struct tevent_req *subreq);
+static void continue_lsa_query_info(struct tevent_req *subreq);
+static void continue_lsa_query_info2(struct tevent_req *subreq);
 static void continue_epm_map_binding(struct composite_context *ctx);
 static void continue_secondary_conn(struct composite_context *ctx);
@@ -529 +532 @@
         struct composite_context *c;
         struct rpc_connect_dci_state *s;
-        struct rpc_request *open_pol_req;
+        struct tevent_req *subreq;
 
         c = talloc_get_type(ctx->async.private_data, struct composite_context);
@@ -574 +577 @@
         s->lsa_open_policy.out.handle     = &s->lsa_handle;
 
-        open_pol_req = dcerpc_lsa_OpenPolicy2_send(s->lsa_pipe, c, &s->lsa_open_policy);
-        if (composite_nomem(open_pol_req, c)) return;
-
-        composite_continue_rpc(c, open_pol_req, continue_lsa_policy, c);
+        subreq = dcerpc_lsa_OpenPolicy2_r_send(s, c->event_ctx,
+                                               s->lsa_pipe->binding_handle,
+                                               &s->lsa_open_policy);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_lsa_policy, c);
 }
 
@@ -585 +590 @@
   for kerberos realm (dns name) and guid. The query may fail.
 */
-static void continue_lsa_policy(struct rpc_request *req)
+static void continue_lsa_policy(struct tevent_req *subreq)
 {
         struct composite_context *c;
         struct rpc_connect_dci_state *s;
-        struct rpc_request *query_info_req;
-
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(c->private_data, struct rpc_connect_dci_state);
 
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_lsa_OpenPolicy2_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!NT_STATUS_IS_OK(c->status)) {
                 composite_error(c, c->status);
@@ -631 +636 @@
         if (composite_nomem(s->lsa_query_info2.out.info, c)) return;
 
-        query_info_req = dcerpc_lsa_QueryInfoPolicy2_send(s->lsa_pipe, c, &s->lsa_query_info2);
-        if (composite_nomem(query_info_req, c)) return;
-
-        composite_continue_rpc(c, query_info_req, continue_lsa_query_info2, c);
+        subreq = dcerpc_lsa_QueryInfoPolicy2_r_send(s, c->event_ctx,
+                                                    s->lsa_pipe->binding_handle,
+                                                    &s->lsa_query_info2);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_lsa_query_info2, c);
 }
 
@@ -642 +649 @@
   may result in failure) and query lsa info for domain name and sid.
 */
-static void continue_lsa_query_info2(struct rpc_request *req)
+static void continue_lsa_query_info2(struct tevent_req *subreq)
 {       
         struct composite_context *c;
         struct rpc_connect_dci_state *s;
-        struct rpc_request *query_info_req;
-
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(c->private_data, struct rpc_connect_dci_state);
 
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_lsa_QueryInfoPolicy2_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         
         /* In case of error just null the realm and guid and proceed
@@ -657 +664 @@
            controller we talking to - NT-style PDC also counts */
 
-        if (NT_STATUS_EQUAL(c->status, NT_STATUS_NET_WRITE_FAULT)) {
+        if (NT_STATUS_EQUAL(c->status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
                 s->r.out.realm = NULL;
                 s->r.out.guid  = NULL;
@@ -706 +713 @@
         if (composite_nomem(s->lsa_query_info.out.info, c)) return;
 
-        query_info_req = dcerpc_lsa_QueryInfoPolicy_send(s->lsa_pipe, c, &s->lsa_query_info);
-        if (composite_nomem(query_info_req, c)) return;
-
-        composite_continue_rpc(c, query_info_req, continue_lsa_query_info, c);
+        subreq = dcerpc_lsa_QueryInfoPolicy_r_send(s, c->event_ctx,
+                                                   s->lsa_pipe->binding_handle,
+                                                   &s->lsa_query_info);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_lsa_query_info, c);
 }
 
@@ -716 +725 @@
   Step 5 of RpcConnectDCInfo: Get domain name and sid
 */
-static void continue_lsa_query_info(struct rpc_request *req)
+static void continue_lsa_query_info(struct tevent_req *subreq)
 {
         struct composite_context *c;
         struct rpc_connect_dci_state *s;
 
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(c->private_data, struct rpc_connect_dci_state);
 
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_lsa_QueryInfoPolicy_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!NT_STATUS_IS_OK(c->status)) {
                 s->r.out.error_string = talloc_asprintf(c,
@@ -763 +773 @@
 
         /* prepare to get endpoint mapping for the requested interface */
-        s->final_binding = talloc(s, struct dcerpc_binding);
+        s->final_binding = talloc_zero(s, struct dcerpc_binding);
         if (composite_nomem(s->final_binding, c)) return;
         
@@ -885 +895 @@
                 if (r->in.dcerpc_iface == &ndr_table_samr) {
                         ctx->samr.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
+                        ctx->samr.samr_handle = ctx->samr.pipe->binding_handle;
 
                 } else if (r->in.dcerpc_iface == &ndr_table_lsarpc) {
                         ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
+                        ctx->lsa.lsa_handle = ctx->lsa.pipe->binding_handle;
                 }