s4:librpc/rpc: fix DEBUG() message

[metze/samba/wip.git] / source4 / librpc / rpc / dcerpc.c

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 7a568d3c9eb0bda01317e85222275e95762e2360..819edc8eaaf790f1421797a44ba8229ce9e3411a 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -67,7 +67,7 @@ static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx,
 
        c->iconv_convenience = talloc_reference(c, ic);
 
-       c->event_ctx = talloc_reference(c, ev);
+       c->event_ctx = ev;
 
        if (c->event_ctx == NULL) {
                talloc_free(c);
@@ -114,6 +114,10 @@ _PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct tevent
        ZERO_STRUCT(p->syntax);
        ZERO_STRUCT(p->transfer_syntax);
 
+       if (DEBUGLVL(100)) {
+               p->conn->flags |= DCERPC_DEBUG_PRINT_BOTH;
+       }
+
        return p;
 }
 
@@ -444,7 +448,7 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
        }
 
        if (creds2.length != sig_size) {
-               DEBUG(0,("dcesrv_auth_response: creds2.length[%u] != sig_size[%u] pad[%u] stub[%u]\n",
+               DEBUG(0,("ncacn_push_request_sign: creds2.length[%u] != sig_size[%u] pad[%u] stub[%u]\n",
                        creds2.length, (uint32_t)sig_size,
                        c->security_state.auth_info->auth_pad_length,
                        pkt->u.request.stub_and_verifier.length));
@@ -1058,6 +1062,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
        while (remaining > 0 || first_packet) {
                uint32_t chunk = MIN(chunk_size, remaining);
                bool last_frag = false;
+               bool do_trans = false;
 
                first_packet = false;
                pkt.pfc_flags &= ~(DCERPC_PFC_FLAG_FIRST |DCERPC_PFC_FLAG_LAST);
@@ -1080,14 +1085,27 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
                        DLIST_REMOVE(p->conn->pending, req);
                        return;
                }
-               
-               req->status = p->conn->transport.send_request(p->conn, &blob, last_frag);
+
+               if (last_frag && !req->async_call) {
+                       do_trans = true;
+               }
+
+               req->status = p->conn->transport.send_request(p->conn, &blob, do_trans);
                if (!NT_STATUS_IS_OK(req->status)) {
                        req->state = RPC_REQUEST_DONE;
                        DLIST_REMOVE(p->conn->pending, req);
                        return;
                }               
 
+               if (last_frag && !do_trans) {
+                       req->status = p->conn->transport.send_read(p->conn);
+                       if (!NT_STATUS_IS_OK(req->status)) {
+                               req->state = RPC_REQUEST_DONE;
+                               DLIST_REMOVE(p->conn->pending, req);
+                               return;
+                       }
+               }
+
                remaining -= chunk;
        }
 }
@@ -1126,7 +1144,7 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
        if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                req->p->last_fault_code = req->fault_code;
        }
-       talloc_free(req);
+       talloc_unlink(talloc_parent(req), req);
        return status;
 }
 
@@ -1136,14 +1154,13 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
 NTSTATUS dcerpc_request(struct dcerpc_pipe *p, 
                        struct GUID *object,
                        uint16_t opnum,
-                       bool async,
                        TALLOC_CTX *mem_ctx,
                        DATA_BLOB *stub_data_in,
                        DATA_BLOB *stub_data_out)
 {
        struct rpc_request *req;
 
-       req = dcerpc_request_send(p, object, opnum, async, stub_data_in);
+       req = dcerpc_request_send(p, object, opnum, false, stub_data_in);
        if (req == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1335,11 +1352,12 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
  send a rpc request given a dcerpc_call structure 
  */
 struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
-                                               const struct GUID *object,
-                                               const struct ndr_interface_table *table,
-                                               uint32_t opnum, 
-                                               TALLOC_CTX *mem_ctx, 
-                                               void *r)
+                                           const struct GUID *object,
+                                           const struct ndr_interface_table *table,
+                                           uint32_t opnum,
+                                           bool async,
+                                           TALLOC_CTX *mem_ctx,
+                                           void *r)
 {
        const struct ndr_interface_call *call;
        struct ndr_push *push;
@@ -1388,8 +1406,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        dump_data(10, request.data, request.length);
 
        /* make the actual dcerpc request */
-       req = dcerpc_request_send(p, object, opnum, table->calls[opnum].async,
-                                 &request);
+       req = dcerpc_request_send(p, object, opnum, async, &request);
 
        if (req != NULL) {
                req->ndr.table = table;
@@ -1506,7 +1523,7 @@ _PUBLIC_ NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
 {
        struct rpc_request *req;
 
-       req = dcerpc_ndr_request_send(p, object, table, opnum, mem_ctx, r);
+       req = dcerpc_ndr_request_send(p, object, table, opnum, false, mem_ctx, r);
        if (req == NULL) {
                return NT_STATUS_NO_MEMORY;
        }