librpc: bring more librpc prototypes in common.

Guenther

diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
index fae303f630e3e64bd018a6adb520d72390fbf79a..d0ffe61c2ad98be575cdbeb2347f21f80656f1e3 100644 (file)
--- a/librpc/rpc/rpc_common.h
+++ b/librpc/rpc/rpc_common.h
@@ -30,6 +30,7 @@ struct ndr_push;
 struct ndr_pull;
 struct ncacn_packet;
 struct epm_floor;
+struct epm_tower;
 struct tevent_context;
 struct tstream_context;
 
@@ -116,6 +117,17 @@ NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code);
 const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
 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);
+NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx,
+                                   const struct dcerpc_binding *binding,
+                                   struct epm_tower *tower);
+NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx,
+                                  struct epm_tower *tower,
+                                  struct dcerpc_binding **b_out);
+NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out);
+char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b);
+NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor, struct ndr_syntax_id *syntax);
+const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t);
+enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower);
 
 /* The following definitions come from ../librpc/rpc/dcerpc_util.c  */
 

diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index a6e3e080920f0617f0b9a80d711deafbb856ea9a..ccd372eee53b43ab91d55a7fd25673bd5c89f5ef 100644 (file)
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -30,26 +30,6 @@
 
 #define SMB_RPC_INTERFACE_VERSION 1
 
-/* The following definitions come from librpc/rpc/binding.c  */
-
-struct epm_floor;
-struct epm_tower;
-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);
-
 struct NL_AUTH_MESSAGE;
 struct pipe_auth_data;
 

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 0a85f24d7bc0c0abe6a08e2e544b3f4557c69a24..5ca6246343d645500b47312ebbff9aff6d0646d1 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -163,7 +163,6 @@ NTSTATUS dcerpc_fetch_session_key(struct dcerpc_pipe *p,
 struct composite_context;
 NTSTATUS dcerpc_secondary_connection_recv(struct composite_context *c,
                                          struct dcerpc_pipe **p2);
-NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out);
 
 struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
                                                     struct dcerpc_binding *binding,
@@ -189,7 +188,6 @@ NTSTATUS dcerpc_pipe_auth(TALLOC_CTX *mem_ctx,
                          const struct ndr_interface_table *table,
                          struct cli_credentials *credentials,
                          struct loadparm_context *lp_ctx);
-char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b);
 NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p,
                                     struct dcerpc_pipe **p2,
                                     struct dcerpc_binding *b);
@@ -244,18 +242,7 @@ void dcerpc_log_packet(const char *lockdir,
                       const struct ndr_interface_table *ndr,
                       uint32_t opnum, uint32_t flags,
                       const DATA_BLOB *pkt);
-NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx,
-                                   const struct dcerpc_binding *binding,
-                                   struct epm_tower *tower);
 
-NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor, struct ndr_syntax_id *syntax);
-
-enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower);
-const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t);
-
-NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, 
-                                  struct epm_tower *tower, 
-                                  struct dcerpc_binding **b_out);
 
 enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);