From 845f9c01ed279495919e2781db2e8927ebd3e968 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 19 Mar 2010 19:16:35 +0100 Subject: s3:librpc/rpc: move prototypes to dcerpc.h metze --- source3/include/proto.h | 18 ------------------ source3/librpc/rpc/dcerpc.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index 403b96ac8f..b42f473d3f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2117,24 +2117,6 @@ extern const struct ndr_syntax_id null_ndr_syntax_id; char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid); -/* The following definitions come from librpc/rpc/binding.c */ - -const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor); -_PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b); -_PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out); -_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor, - struct ndr_syntax_id *syntax); -const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor); -enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot); -_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower); -_PUBLIC_ const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t); -_PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, - struct epm_tower *tower, - struct dcerpc_binding **b_out); -_PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, - const struct dcerpc_binding *binding, - struct epm_tower *tower); - /* The following definitions come from libsmb/cliconnect.c */ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h index 07e03e9612..0c120dfef5 100644 --- a/source3/librpc/rpc/dcerpc.h +++ b/source3/librpc/rpc/dcerpc.h @@ -93,4 +93,22 @@ struct dcerpc_binding { /* use NDR64 transport */ #define DCERPC_NDR64 (1<<21) +/* The following definitions come from librpc/rpc/binding.c */ + +const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor); +_PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b); +_PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out); +_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor, + struct ndr_syntax_id *syntax); +const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor); +enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot); +_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower); +_PUBLIC_ const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t); +_PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, + struct epm_tower *tower, + struct dcerpc_binding **b_out); +_PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, + const struct dcerpc_binding *binding, + struct epm_tower *tower); + #endif /* __DCERPC_H__ */ -- cgit