rpc_server: Re-order and rename remote and local address in np_open()

We use this order and name consistently eleswhere.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 0247abb0619109f232dd675f7f2bd5db146cd982..f9b7855b40fc511bdc76c766a65fa0d7990ce430 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -49,8 +49,8 @@ bool fsp_is_np(struct files_struct *fsp)
 }
 
 NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
-                const struct tsocket_address *local_address,
-                const struct tsocket_address *remote_address,
+                const struct tsocket_address *remote_client_address,
+                const struct tsocket_address *local_server_address,
                 struct auth_session_info *session_info,
                 struct tevent_context *ev_ctx,
                 struct messaging_context *msg_ctx,
@@ -84,8 +84,8 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
        case RPC_SERVICE_MODE_EXTERNAL:
                status = make_external_rpc_pipe(handle,
                                                name,
-                                               remote_address,
-                                               local_address,
+                                               remote_client_address,
+                                               local_server_address,
                                                session_info,
                                                &npa);
                if (!NT_STATUS_IS_OK(status)) {
@@ -111,7 +111,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
                                                           msg_ctx,
                                                           name,
                                                           &syntax,
-                                                          remote_address,
+                                                          remote_client_address,
                                                           session_info,
                                                           &npa);
                if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/rpc_server/srv_pipe_hnd.h b/source3/rpc_server/srv_pipe_hnd.h
index f6837dc87ec3f61cf91235d3e69b138bdc859f0e..26fc351043e2e666aae7b048d16a78bd642a90ae 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.h
+++ b/source3/rpc_server/srv_pipe_hnd.h
@@ -29,8 +29,8 @@ struct pipes_struct;
 
 bool fsp_is_np(struct files_struct *fsp);
 NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
-                const struct tsocket_address *local_address,
-                const struct tsocket_address *remote_address,
+                const struct tsocket_address *remote_client_address,
+                const struct tsocket_address *local_server_address,
                 struct auth_session_info *session_info,
                 struct tevent_context *ev_ctx,
                 struct messaging_context *msg_ctx,

diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index bdc5af0ef919f0e27f30b5b7d69811323a89e9d4..4be57bc2a5f0dea80515419bdaa2d8763be60958 100644 (file)
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -64,8 +64,8 @@ NTSTATUS open_np_file(struct smb_request *smb_req, const char *name,
        }
 
        status = np_open(fsp, name,
-                        conn->sconn->local_address,
                         conn->sconn->remote_address,
+                        conn->sconn->local_address,
                         conn->session_info,
                         conn->sconn->ev_ctx,
                         conn->sconn->msg_ctx,