diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-29 15:13:55 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-05-17 09:18:41 +0200 |
| commit | ce1f8865d46b5f3078ca9f21d208123dae83c4a1 (patch) | |
| tree | 0460f7c25b6a5fa6388fb697fa1d627a55804086 | |
| parent | 281e962307fdbd6d0c7cce379a03dfabdd283568 (diff) | |
| download | samba-ce1f8865d46b5f3078ca9f21d208123dae83c4a1.tar.gz samba-ce1f8865d46b5f3078ca9f21d208123dae83c4a1.tar.xz samba-ce1f8865d46b5f3078ca9f21d208123dae83c4a1.zip | |
s3-proto: move more librpc prototypes to librpc/rpc/dcerpc.h
Guenther
(cherry picked from commit faf11751255202274505d72848c54ee6e5dce7b6)
(cherry picked from commit f92793f3f728c05f47671dc2697bf3ea3ace705d)
| -rw-r--r-- | source3/include/proto.h | 9 | ||||
| -rw-r--r-- | source3/librpc/rpc/dcerpc.h | 8 | ||||
| -rw-r--r-- | source3/librpc/rpc/rpc_common.c | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d405abe28fc..2c0b9f26638 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2653,14 +2653,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, @@ -2669,6 +2661,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 30c6d1b75da..d7e8e0c193d 100644 --- a/source3/librpc/rpc/dcerpc.h +++ b/source3/librpc/rpc/dcerpc.h @@ -88,4 +88,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 b4c7e1dcd4c..65e3205f62a 100644 --- 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" |