diff options
| author | Gary Lockyer <gary@catalyst.net.nz> | 2017-03-10 11:38:56 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-03-29 02:37:28 +0200 |
| commit | 3b72863e001c290b5833b327e5fb9003c6311fc6 (patch) | |
| tree | dfcb7a38e3d059dcc1692946a1447c44dcdae766 /source4/smbd | |
| parent | 68200d0d88582d7122b1d441376956b2ebfa09d8 (diff) | |
| download | samba-3b72863e001c290b5833b327e5fb9003c6311fc6.tar.gz | |
s4-named_pipe_auth: Rename client -> remote_client and server -> local_server
This brings the callers of named_pipe_auth in line with that subsystem.
While these names may be better, the rest of Samba consistently uses
remote_address and local_address, and this difference has hidden bugs
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Pair-Programmed-by: Gary Lockyer <gary@catalyst.net.nz>
Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/service_named_pipe.c | 26 |
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, |