From 689e251056699b20b0610c52ad4dd413f946fa63 Mon Sep 17 00:00:00 2001
From: Gary Lockyer <gary@catalyst.net.nz>
Date: Fri, 10 Mar 2017 12:33:06 +1300
Subject: [PATCH] s3-named_pipe_auth: Rename client -> remote_client and server
 -> local_server

This brings the callers of named_pipe_auth in line with that subsystem.

Much of Samba 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>
---
 source3/rpc_server/rpc_ncacn_np.c | 13 +++++++------
 source3/rpc_server/rpc_server.c   | 18 +++++++++---------
 source3/rpc_server/rpc_server.h   |  8 ++++----
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index 121e776b90c..be0e1c9a763 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -123,14 +123,15 @@ NTSTATUS make_internal_rpc_pipe_socketpair(TALLOC_CTX *mem_ctx,
 		goto out;
 	}
 
-	npc->client = tsocket_address_copy(remote_address, npc);
-	if (npc->client == NULL) {
+	npc->remote_client_addr = tsocket_address_copy(remote_address, npc);
+	if (npc->remote_client_addr == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		goto out;
 	}
 
-	npc->client_name = tsocket_address_inet_addr_string(npc->client, npc);
-	if (npc->client_name == NULL) {
+	npc->remote_client_name = tsocket_address_inet_addr_string(npc->remote_client_addr,
+								   npc);
+	if (npc->remote_client_name == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		goto out;
 	}
@@ -145,8 +146,8 @@ NTSTATUS make_internal_rpc_pipe_socketpair(TALLOC_CTX *mem_ctx,
 				      npc->msg_ctx,
 				      npc->pipe_name,
 				      NCACN_NP,
-				      npc->server,
-				      npc->client,
+				      npc->local_server_addr,
+				      npc->remote_client_addr,
 				      npc->session_info,
 				      &npc->p,
 				      &error);
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 21504c0eeed..0ed8e1ffb15 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -356,10 +356,10 @@ static void named_pipe_accept_done(struct tevent_req *subreq)
 
 	ret = tstream_npa_accept_existing_recv(subreq, &error, npc,
 						&npc->tstream,
-						&npc->client,
-						&npc->client_name,
-						&npc->server,
-						&npc->server_name,
+						&npc->remote_client_addr,
+						&npc->remote_client_name,
+						&npc->local_server_addr,
+						&npc->local_server_name,
 						&session_info_transport);
 
 	npc->session_info = talloc_move(npc, &session_info_transport->session_info);
@@ -375,8 +375,8 @@ static void named_pipe_accept_done(struct tevent_req *subreq)
 	ret = make_server_pipes_struct(npc,
 				       npc->msg_ctx,
 				       npc->pipe_name, NCACN_NP,
-				       npc->server,
-				       npc->client,
+				       npc->local_server_addr,
+				       npc->remote_client_addr,
 				       npc->session_info,
 				       &npc->p, &error);
 	if (ret != 0) {
@@ -402,7 +402,7 @@ static void named_pipe_accept_done(struct tevent_req *subreq)
 
 fail:
 	DEBUG(2, ("Fatal error. Terminating client(%s) connection!\n",
-		  npc->client_name));
+		  npc->remote_client_name));
 	/* terminate client connection */
 	talloc_free(npc);
 	return;
@@ -531,7 +531,7 @@ void named_pipe_packet_process(struct tevent_req *subreq)
 fail:
 	DEBUG(2, ("Fatal error(%s). "
 		  "Terminating client(%s) connection!\n",
-		  nt_errstr(status), npc->client_name));
+		  nt_errstr(status), npc->remote_client_name));
 	/* terminate client connection */
 	talloc_free(npc);
 	return;
@@ -583,7 +583,7 @@ static void named_pipe_packet_done(struct tevent_req *subreq)
 fail:
 	DEBUG(2, ("Fatal error(%s). "
 		  "Terminating client(%s) connection!\n",
-		  strerror(sys_errno), npc->client_name));
+		  strerror(sys_errno), npc->remote_client_name));
 	/* terminate client connection */
 	talloc_free(npc);
 	return;
diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index 2291350a07f..947b9133f94 100644
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -37,10 +37,10 @@ struct named_pipe_client {
 
 	struct tstream_context *tstream;
 
-	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 *session_info;
 
-- 
2.11.4.GIT