Revert "HACK... https://bugzilla.samba.org/show_bug.cgi?id=12892"

[metze/samba/wip.git] / source3 / rpc_server / rpc_ncacn_np.h

diff --git a/source3/rpc_server/rpc_ncacn_np.h b/source3/rpc_server/rpc_ncacn_np.h
index b8426e07ac6f0ccc1d903ab951e824eaec378a82..9ba58644ec0588343bf62a369fd46b67c321992a 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.h
+++ b/source3/rpc_server/rpc_ncacn_np.h
@@ -39,19 +39,21 @@ struct npa_state {
 
 NTSTATUS make_external_rpc_pipe(TALLOC_CTX *mem_ctx,
                                const char *pipe_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,
                                const struct auth_session_info *session_info,
                                struct npa_state **pnpa);
 
-NTSTATUS make_internal_rpc_pipe_socketpair(TALLOC_CTX *mem_ctx,
-                                          struct tevent_context *ev_ctx,
-                                          struct messaging_context *msg_ctx,
-                                          const char *pipe_name,
-                                          const struct ndr_syntax_id *syntax,
-                                          const struct tsocket_address *remote_address,
-                                          const struct auth_session_info *session_info,
-                                          struct npa_state **pnpa);
+NTSTATUS make_internal_rpc_pipe_socketpair(
+       TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev_ctx,
+       struct messaging_context *msg_ctx,
+       const char *pipe_name,
+       const struct ndr_syntax_id *syntax,
+       const struct tsocket_address *remote_address,
+       const struct tsocket_address *local_address,
+       const struct auth_session_info *session_info,
+       struct npa_state **pnpa);
 
 struct np_proxy_state {
        uint16_t file_type;
@@ -65,16 +67,18 @@ struct np_proxy_state {
 struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
                                              const struct ndr_syntax_id *syntax,
                                              const struct tsocket_address *remote_address,
+                                             const struct tsocket_address *local_address,
                                              const struct auth_session_info *session_info,
                                              struct messaging_context *msg_ctx);
 struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
                                const char *pipe_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,
                                const struct auth_session_info *session_info);
 NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
                               const struct ndr_interface_table *ndr_table,
                               const struct tsocket_address *remote_address,
+                              const struct tsocket_address *local_address,
                               const struct auth_session_info *session_info,
                               struct messaging_context *msg_ctx,
                               struct dcerpc_binding_handle **binding_handle);
@@ -82,13 +86,15 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
                                 const struct ndr_interface_table *table,
                                 const struct auth_session_info *session_info,
                                 const struct tsocket_address *remote_address,
+                                const struct tsocket_address *local_address,
                                 struct messaging_context *msg_ctx,
                                 struct rpc_pipe_client **cli_pipe);
 
 NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
-                               const struct ndr_syntax_id *abstract_syntax,
+                               const struct ndr_interface_table *ndr_table,
                                const struct auth_session_info *session_info,
                                const struct tsocket_address *remote_address,
+                               const struct tsocket_address *local_address,
                                struct messaging_context *msg_ctx,
                                struct rpc_pipe_client **presult);