From 10478d39a1c028a79991a91984243f8d9d063045 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 6 Oct 2021 11:16:21 +0200 Subject: [PATCH] rpc_server3: Remove dcerpc_ncacn_conn->remote_client_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 Reviewed-by: Jeremy Allison --- source3/rpc_server/rpc_server.h | 1 - source3/rpc_server/rpc_worker.c | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h index 056cb24c53d..9fdc3327abf 100644 --- a/source3/rpc_server/rpc_server.h +++ b/source3/rpc_server/rpc_server.h @@ -41,7 +41,6 @@ struct dcerpc_ncacn_conn { struct dcesrv_endpoint *endpoint; - struct tsocket_address *remote_client_addr; char *remote_client_name; struct tsocket_address *local_server_addr; char *local_server_name; diff --git a/source3/rpc_server/rpc_worker.c b/source3/rpc_server/rpc_worker.c index 9a547fcbdfe..6ba6f9790c4 100644 --- a/source3/rpc_server/rpc_worker.c +++ b/source3/rpc_server/rpc_worker.c @@ -171,6 +171,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 dcerpc_binding *b = NULL; enum dcerpc_transport_t transport; struct dcesrv_endpoint *ep = NULL; @@ -260,7 +261,7 @@ static void rpc_worker_new_client( ret = tsocket_address_unix_from_path( ncacn_conn, info5->remote_client_addr, - &ncacn_conn->remote_client_addr); + &remote_client_addr); if (ret == -1) { DBG_DEBUG("tsocket_address_unix_from_path" "(%s) failed: %s\n", @@ -302,7 +303,7 @@ static void rpc_worker_new_client( "ip", info5->remote_client_addr, info5->remote_client_port, - &ncacn_conn->remote_client_addr); + &remote_client_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->remote_address = ncacn_conn->remote_client_addr; + dcesrv_conn->remote_address = + talloc_move(dcesrv_conn, &remote_client_addr); if (client->bind_packet.length == 0) { DBG_DEBUG("Expected bind packet\n");