s3-rpc_server: Re-order local and remote address in make_server_pipes_struct()

The rest of the code uses remote before local, and this
often causes 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>

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index be0e1c9a76339e1772920a8d06982450ba897fcc..6733e33deb17c8a473c019f7ecd5fdaf168d89af 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -146,8 +146,8 @@ NTSTATUS make_internal_rpc_pipe_socketpair(TALLOC_CTX *mem_ctx,
                                      npc->msg_ctx,
                                      npc->pipe_name,
                                      NCACN_NP,
-                                     npc->local_server_addr,
                                      npc->remote_client_addr,
+                                     npc->local_server_addr,
                                      npc->session_info,
                                      &npc->p,
                                      &error);

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 0ed8e1ffb15a499562cb4ab392395c8afb88084d..dab19f64a26fe97d5099e85e2f5d9e3a43b14f23 100644 (file)
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -40,8 +40,8 @@ int make_server_pipes_struct(TALLOC_CTX *mem_ctx,
                             struct messaging_context *msg_ctx,
                             const char *pipe_name,
                             enum dcerpc_transport_t transport,
-                            const struct tsocket_address *local_address,
                             const struct tsocket_address *remote_address,
+                            const struct tsocket_address *local_address,
                             struct auth_session_info *session_info,
                             struct pipes_struct **_p,
                             int *perrno)
@@ -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->local_server_addr,
                                       npc->remote_client_addr,
+                                      npc->local_server_addr,
                                       npc->session_info,
                                       &npc->p, &error);
        if (ret != 0) {
@@ -1121,8 +1121,8 @@ void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
                                      ncacn_conn->msg_ctx,
                                      pipe_name,
                                      ncacn_conn->transport,
-                                     ncacn_conn->server,
                                      ncacn_conn->client,
+                                     ncacn_conn->server,
                                      ncacn_conn->session_info,
                                      &ncacn_conn->p,
                                      &sys_errno);

diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index 947b9133f94dd58935da6f890429c7eda886e6bc..fd8c652f0676cd031230beb9f30376a7835e7807 100644 (file)
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -69,8 +69,8 @@ int make_server_pipes_struct(TALLOC_CTX *mem_ctx,
                             struct messaging_context *msg_ctx,
                             const char *pipe_name,
                             enum dcerpc_transport_t transport,
-                            const struct tsocket_address *local_address,
                             const struct tsocket_address *remote_address,
+                            const struct tsocket_address *local_address,
                             struct auth_session_info *session_info,
                             struct pipes_struct **_p,
                             int *perrno);