diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-29 15:13:55 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-04-29 21:01:04 +0200 |
| commit | faf11751255202274505d72848c54ee6e5dce7b6 (patch) | |
| tree | 43eb9ad458e6d59e6169832a8cfa428a32f01869 | |
| parent | d6289641f5d421d188c37819f5fe8ceeb5a86aba (diff) | |
| download | samba-faf11751255202274505d72848c54ee6e5dce7b6.tar.gz samba-faf11751255202274505d72848c54ee6e5dce7b6.tar.bz2 samba-faf11751255202274505d72848c54ee6e5dce7b6.zip | |
s3-proto: move more librpc prototypes to librpc/rpc/dcerpc.h
Guenther
| -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 c08b204bb0..2626639da6 100644 --- 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 0a6ddaca17..05e8e0d3af 100644 --- 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 b4c7e1dcd4..65e3205f62 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" |