summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/smbd/service_named_pipe.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c
index 02758b90ce1..c7e31bc4718 100644
--- a/source4/smbd/service_named_pipe.c
+++ b/source4/smbd/service_named_pipe.c
@@ -88,10 +88,10 @@ static void named_pipe_accept_done(struct tevent_req *subreq)
struct named_pipe_socket *pipe_sock =
talloc_get_type(conn->private_data,
struct named_pipe_socket);
- struct tsocket_address *client;
- char *client_name;
- struct tsocket_address *server;
- char *server_name;
+ struct tsocket_address *remote_client_addr;
+ char *remote_client_name;
+ struct tsocket_address *local_server_addr;
+ char *local_server_name;
struct auth_session_info_transport *session_info_transport;
const char *reason = NULL;
TALLOC_CTX *tmp_ctx;
@@ -106,10 +106,10 @@ static void named_pipe_accept_done(struct tevent_req *subreq)
ret = tstream_npa_accept_existing_recv(subreq, &error, tmp_ctx,
&conn->tstream,
- &client,
- &client_name,
- &server,
- &server_name,
+ &remote_client_addr,
+ &remote_client_name,
+ &local_server_addr,
+ &local_server_name,
&session_info_transport);
TALLOC_FREE(subreq);
if (ret != 0) {
@@ -119,14 +119,16 @@ static void named_pipe_accept_done(struct tevent_req *subreq)
goto out;
}
- conn->local_address = talloc_move(conn, &server);
- conn->remote_address = talloc_move(conn, &client);
+ conn->local_address = talloc_move(conn, &local_server_addr);
+ conn->remote_address = talloc_move(conn, &remote_client_addr);
DEBUG(10, ("Accepted npa connection from %s. "
"Client: %s (%s). Server: %s (%s)\n",
tsocket_address_string(conn->remote_address, tmp_ctx),
- client_name, tsocket_address_string(client, tmp_ctx),
- server_name, tsocket_address_string(server, tmp_ctx)));
+ local_server_name,
+ tsocket_address_string(local_server_addr, tmp_ctx),
+ remote_client_name,
+ tsocket_address_string(remote_client_addr, tmp_ctx)));
conn->session_info = auth_session_info_from_transport(conn, session_info_transport,
conn->lp_ctx,