s3-proto: move more librpc prototypes to librpc/rpc/dcerpc.h

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c08b204bb0bfb096a65e8d0b5b0ccde08e69fa83..2626639da617c1455dff605856350fb727271468 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2619,14 +2619,6 @@ void set_server_role(void);
 uint32 get_int_param( const char* param );
 char* get_string_param( const char* param );
 
-/* The following definitions come from librpc/rpc/rpc_common.c  */
-struct ndr_interface_table;
-bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
-const struct ndr_interface_table *get_iface_from_syntax(
-       const struct ndr_syntax_id *syntax);
-const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
-                                     const struct ndr_syntax_id *syntax);
-
 /* The following definitions come from rpc_server/rpc_ncacn_np.c  */
 struct auth_serversupplied_info;
 struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
@@ -2635,6 +2627,7 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
                                              const struct auth_serversupplied_info *session_info,
                                              struct messaging_context *msg_ctx);
 struct dcerpc_binding_handle;
+struct ndr_interface_table;
 NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
                               const struct ndr_interface_table *ndr_table,
                               struct client_address *client_id,

diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 0a6ddaca17323bf023c9c08fc62fe2abc08d6ae3..05e8e0d3afa6d30a1b60a4438433096c744267f4 100644 (file)
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -75,4 +75,12 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
                           DATA_BLOB *raw_pkt,
                           size_t *pad_len);
 
+/* The following definitions come from librpc/rpc/rpc_common.c  */
+
+bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
+const struct ndr_interface_table *get_iface_from_syntax(
+       const struct ndr_syntax_id *syntax);
+const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
+                                     const struct ndr_syntax_id *syntax);
+
 #endif /* __S3_DCERPC_H__ */

diff --git a/source3/librpc/rpc/rpc_common.c b/source3/librpc/rpc/rpc_common.c
index b4c7e1dcd4c0db65b30d92e2839067a0faeb37b1..65e3205f62a28991730293df0bfaf0c6035750a1 100644 (file)
--- a/source3/librpc/rpc/rpc_common.c
+++ b/source3/librpc/rpc/rpc_common.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "../librpc/gen_ndr/ndr_dssetup.h"
 #include "../librpc/gen_ndr/ndr_samr.h"