rpc_server3: Remove dcerpc_ncacn_conn->tstream

This was only used inside rpc_worker_new_client(), a leftover from
times where accepting a client was an async process waiting for the
struct named_pipe_auth_req_info4.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index 3d3549e67fef6956ae1dcbc6584c472b49c68cb5..056cb24c53dfd56bf81ff069a294c17b9b543b5e 100644 (file)
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -41,8 +41,6 @@ struct dcerpc_ncacn_conn {
 
        struct dcesrv_endpoint *endpoint;
 
-       struct tstream_context *tstream;
-
        struct tsocket_address *remote_client_addr;
        char *remote_client_name;
        struct tsocket_address *local_server_addr;

diff --git a/source3/rpc_server/rpc_worker.c b/source3/rpc_server/rpc_worker.c
index 1a4696776c6a0a58f5bcdf307aee9998d9658623..9a547fcbdfe8710356d9f4e3a1cff855687d9d3c 100644 (file)
--- a/source3/rpc_server/rpc_worker.c
+++ b/source3/rpc_server/rpc_worker.c
@@ -174,6 +174,7 @@ static void rpc_worker_new_client(
        struct dcerpc_binding *b = NULL;
        enum dcerpc_transport_t transport;
        struct dcesrv_endpoint *ep = NULL;
+       struct tstream_context *tstream = NULL;
        struct dcerpc_ncacn_conn *ncacn_conn = NULL;
        struct dcesrv_connection *dcesrv_conn = NULL;
        DATA_BLOB buffer = { .data = NULL };
@@ -346,7 +347,7 @@ static void rpc_worker_new_client(
                        ncacn_conn,
                        sock,
                        FILE_TYPE_MESSAGE_MODE_PIPE,
-                       &ncacn_conn->tstream);
+                       &tstream);
                if (ret == -1) {
                        DBG_DEBUG("tstream_npa_existing_socket failed: %s\n",
                                  strerror(errno));
@@ -364,7 +365,7 @@ static void rpc_worker_new_client(
                transport = info5->transport;
        } else {
                ret = tstream_bsd_existing_socket(
-                       ncacn_conn, sock, &ncacn_conn->tstream);
+                       ncacn_conn, sock, &tstream);
                if (ret == -1) {
                        DBG_DEBUG("tstream_bsd_existing_socket failed: %s\n",
                                  strerror(errno));
@@ -420,7 +421,7 @@ static void rpc_worker_new_client(
                goto fail;
        }
 
-       dcesrv_conn->stream = talloc_move(dcesrv_conn, &ncacn_conn->tstream);
+       dcesrv_conn->stream = talloc_move(dcesrv_conn, &tstream);
        dcesrv_conn->local_address = ncacn_conn->local_server_addr;
        dcesrv_conn->remote_address = ncacn_conn->remote_client_addr;