s4:librpc/rpc: remove dcerpc_shutdown_pipe() layer

This is only called from dcerpc_connection_dead()
mostly via dcerpc_connection_destructor().

Calling tstream_disconnect_send(), triggers a smb*cli_close_send(),
but we implicitly call talloc_free() on the returned 'req',
before it's send into the low-level tcp socket, which means
the SMB signing gets out of sync. For now we just rely on
the tstream destructor to close the smb open.

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index a0b00aff817d4b3215410f5e473158124d10e52b..109b3fab8a03f7c1d7b0a2ede1e9305321ce47e3 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -103,7 +103,6 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcecli_connection *c,
                                        ndr_push_flags_fn_t ndr_push,
                                        ndr_pull_flags_fn_t ndr_pull,
                                        ndr_print_function_t ndr_print);
-static NTSTATUS dcerpc_shutdown_pipe(struct dcecli_connection *p, NTSTATUS status);
 static NTSTATUS dcerpc_send_request(struct dcecli_connection *p, DATA_BLOB *data,
                             bool trigger_read);
 static NTSTATUS dcerpc_send_read(struct dcecli_connection *p);
@@ -856,6 +855,7 @@ static int dcerpc_req_dequeue(struct rpc_request *req)
        return 0;
 }
 
+static void dcerpc_transport_dead(struct dcecli_connection *c, NTSTATUS status);
 
 /*
   mark the dcerpc connection dead. All outstanding requests get an error
@@ -869,7 +869,7 @@ static void dcerpc_connection_dead(struct dcecli_connection *conn, NTSTATUS stat
        TALLOC_FREE(conn->io_trigger);
        conn->io_trigger_pending = false;
 
-       dcerpc_shutdown_pipe(conn, status);
+       dcerpc_transport_dead(conn, status);
 
        /* all pending requests get the error */
        while (conn->pending) {
@@ -2337,63 +2337,6 @@ static void dcerpc_transport_dead(struct dcecli_connection *c, NTSTATUS status)
        dcerpc_recv_data(c, NULL, status);
 }
 
-
-/*
-   shutdown SMB pipe connection
-*/
-struct dcerpc_shutdown_pipe_state {
-       struct dcecli_connection *c;
-       NTSTATUS status;
-};
-
-static void dcerpc_shutdown_pipe_done(struct tevent_req *subreq);
-
-static NTSTATUS dcerpc_shutdown_pipe(struct dcecli_connection *c, NTSTATUS status)
-{
-       struct dcerpc_shutdown_pipe_state *state;
-       struct tevent_req *subreq;
-
-       if (c->transport.stream == NULL) {
-               return NT_STATUS_OK;
-       }
-
-       state = talloc_zero(c, struct dcerpc_shutdown_pipe_state);
-       if (state == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       state->c = c;
-       state->status = status;
-
-       subreq = tstream_disconnect_send(state, c->event_ctx, c->transport.stream);
-       if (subreq == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       tevent_req_set_callback(subreq, dcerpc_shutdown_pipe_done, state);
-
-       return status;
-}
-
-static void dcerpc_shutdown_pipe_done(struct tevent_req *subreq)
-{
-       struct dcerpc_shutdown_pipe_state *state =
-               tevent_req_callback_data(subreq, struct dcerpc_shutdown_pipe_state);
-       struct dcecli_connection *c = state->c;
-       NTSTATUS status = state->status;
-       int error;
-
-       /*
-        * here we ignore the return values...
-        */
-       tstream_disconnect_recv(subreq, &error);
-       TALLOC_FREE(subreq);
-
-       TALLOC_FREE(state);
-
-       dcerpc_transport_dead(c, status);
-}
-
-
-
 struct dcerpc_send_read_state {
        struct dcecli_connection *p;
 };