rpc_server3: Remove dcerpc_ncacn_conn->local_server_addr

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 9fdc3327abfcf8ac573a13f481f376e80a2c59a1..4aafd141147a9b0e7b57a303aa3a6fff947b2402 100644 (file)
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -42,7 +42,6 @@ struct dcerpc_ncacn_conn {
        struct dcesrv_endpoint *endpoint;
 
        char *remote_client_name;
-       struct tsocket_address *local_server_addr;
        char *local_server_name;
        struct auth_session_info *session_info;
 };

diff --git a/source3/rpc_server/rpc_worker.c b/source3/rpc_server/rpc_worker.c
index 6ba6f9790c4c22d0791e9f7c28d6f26f44a8e3eb..165dd64f926a9f7a4afde1a6912fd9534b615efa 100644 (file)
--- a/source3/rpc_server/rpc_worker.c
+++ b/source3/rpc_server/rpc_worker.c
@@ -172,6 +172,7 @@ static void rpc_worker_new_client(
        struct dcesrv_context *dce_ctx = worker->dce_ctx;
        struct named_pipe_auth_req_info5 *info5 = client->npa_info5;
        struct tsocket_address *remote_client_addr = NULL;
+       struct tsocket_address *local_server_addr = NULL;
        struct dcerpc_binding *b = NULL;
        enum dcerpc_transport_t transport;
        struct dcesrv_endpoint *ep = NULL;
@@ -281,7 +282,7 @@ static void rpc_worker_new_client(
                ret = tsocket_address_unix_from_path(
                        ncacn_conn,
                        info5->local_server_addr,
-                       &ncacn_conn->local_server_addr);
+                       &local_server_addr);
                if (ret == -1) {
                        DBG_DEBUG("tsocket_address_unix_from_path"
                                  "(%s) failed: %s\n",
@@ -325,7 +326,7 @@ static void rpc_worker_new_client(
                        "ip",
                        info5->local_server_addr,
                        info5->local_server_port,
-                       &ncacn_conn->local_server_addr);
+                       &local_server_addr);
                if (ret == -1) {
                        DBG_DEBUG("tsocket_address_inet_from_strings"
                                  "(%s, %"PRIu16") failed: %s\n",
@@ -423,7 +424,8 @@ static void rpc_worker_new_client(
        }
 
        dcesrv_conn->stream = talloc_move(dcesrv_conn, &tstream);
-       dcesrv_conn->local_address = ncacn_conn->local_server_addr;
+       dcesrv_conn->local_address =
+               talloc_move(dcesrv_conn, &local_server_addr);
        dcesrv_conn->remote_address =
                talloc_move(dcesrv_conn, &remote_client_addr);