Changeset 862 for trunk/server/source3/rpc_client/cli_pipe.c

Timestamp:

May 13, 2014, 11:39:04 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/rpc_client/cli_pipe.c (modified) (16 diffs)

trunk/server/source3/rpc_client/cli_pipe.c

@@ -236 +236 @@
         struct rpc_pipe_client *cli;
         uint16_t frag_len;
+
         DATA_BLOB *pdu;
 };
@@ -245 +246 @@
                                                  struct event_context *ev,
                                                  struct rpc_pipe_client *cli,
+
                                                  DATA_BLOB *pdu)
 {
@@ -260 +262 @@
         state->cli = cli;
         state->frag_len = RPC_HEADER_LEN;
+
         state->pdu = pdu;
 
@@ -282 +285 @@
 
         state->frag_len = dcerpc_get_frag_length(pdu);
+
+
+
+
+
+
+
+
+
 
         /*
@@ -330 +342 @@
 
         state->frag_len = dcerpc_get_frag_length(state->pdu);
+
+
+
+
+
+
+
+
+
 
         if (!data_blob_realloc(NULL, state->pdu, state->frag_len)) {
@@ -691 +712 @@
         struct rpc_pipe_client *cli;
         uint8_t expected_pkt_type;
+
 
         DATA_BLOB incoming_frag;
@@ -709 +731 @@
                                             struct rpc_pipe_client *cli,
                                             DATA_BLOB *data, /* Outgoing PDU */
-                                            uint8_t expected_pkt_type)
+                                            uint8_t expected_pkt_type,
+                                            uint32_t call_id)
 {
         struct tevent_req *req, *subreq;
@@ -723 +746 @@
         state->cli = cli;
         state->expected_pkt_type = expected_pkt_type;
+
         state->incoming_frag = data_blob_null;
         state->reply_pdu = data_blob_null;
@@ -822 +846 @@
         /* Ensure we have enough data for a pdu. */
         subreq = get_complete_frag_send(state, state->ev, state->cli,
+
                                         &state->incoming_frag);
         if (tevent_req_nomem(subreq, req)) {
@@ -941 +966 @@
 
         subreq = get_complete_frag_send(state, state->ev, state->cli,
+
                                         &state->incoming_frag);
         if (tevent_req_nomem(subreq, req)) {
@@ -1293 +1319 @@
                 subreq = rpc_api_pipe_send(state, ev, state->cli,
                                            &state->rpc_out,
-                                           DCERPC_PKT_RESPONSE);
+                                           DCERPC_PKT_RESPONSE,
+                                           state->call_id);
                 if (subreq == NULL) {
                         goto fail;
@@ -1429 +1456 @@
                 subreq = rpc_api_pipe_send(state, state->ev, state->cli,
                                            &state->rpc_out,
-                                           DCERPC_PKT_RESPONSE);
+                                           DCERPC_PKT_RESPONSE,
+                                           state->call_id);
                 if (tevent_req_nomem(subreq, req)) {
                         return;
@@ -1668 +1696 @@
 
         subreq = rpc_api_pipe_send(state, ev, cli, &state->rpc_out,
-                                   DCERPC_PKT_BIND_ACK);
+                                   DCERPC_PKT_BIND_ACK);
         if (subreq == NULL) {
                 goto fail;
@@ -1866 +1894 @@
 
         subreq = rpc_api_pipe_send(state, state->ev, state->cli,
-                                   &state->rpc_out, DCERPC_PKT_ALTER_RESP);
+                                   &state->rpc_out, DCERPC_PKT_ALTER_RESP,
+                                   state->rpc_call_id);
         if (subreq == NULL) {
                 return NT_STATUS_NO_MEMORY;
@@ -1898 +1927 @@
 
         subreq = rpc_api_pipe_send(state, state->ev, state->cli,
-                                   &state->rpc_out, DCERPC_PKT_AUTH3);
+                                   &state->rpc_out, DCERPC_PKT_AUTH3,
+                                   state->rpc_call_id);
         if (subreq == NULL) {
                 return NT_STATUS_NO_MEMORY;
@@ -2451 +2481 @@
         result->max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
 
-        if (!resolve_name(host, &addr, 0, false)) {
+        if (!resolve_name(host, &addr, , false)) {
                 status = NT_STATUS_NOT_FOUND;
                 goto fail;