librpc/rpc: move struct dcerpc_binding to rpc_common.h

metze

diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
index 69ee69411a725b84a725dde266313abe296a5d8b..f940c3f234592e7342189818eadd484fafbcc128 100644 (file)
--- a/librpc/rpc/rpc_common.h
+++ b/librpc/rpc/rpc_common.h
@@ -38,6 +38,20 @@ enum dcerpc_transport_t {
        NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, 
        NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
 
+/** this describes a binding to a particular transport/pipe */
+struct dcerpc_binding {
+       enum dcerpc_transport_t transport;
+       struct ndr_syntax_id object;
+       const char *host;
+       const char *target_hostname;
+       const char *target_principal;
+       const char *endpoint;
+       const char **options;
+       const char *localaddress;
+       uint32_t flags;
+       uint32_t assoc_group_id;
+};
+
 /* The following definitions come from ../librpc/rpc/dcerpc_error.c  */
 
 const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);

diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 4f449c6a77d6bbfe28440cca0f6be444cf91200d..354c6829a266611bd7029b21826fcfe35565742c 100644 (file)
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -30,21 +30,6 @@
 
 #define SMB_RPC_INTERFACE_VERSION 1
 
-/** this describes a binding to a particular transport/pipe */
-struct dcerpc_binding {
-       enum dcerpc_transport_t transport;
-       struct ndr_syntax_id object;
-       const char *host;
-       const char *target_hostname;
-       const char *target_principal;
-       const char *endpoint;
-       const char **options;
-       const char *localaddress;
-       uint32_t flags;
-       uint32_t assoc_group_id;
-};
-
-
 /* dcerpc pipe flags */
 #define DCERPC_DEBUG_PRINT_IN          (1<<0)
 #define DCERPC_DEBUG_PRINT_OUT         (1<<1)

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index fe3ce93d67e09f95622a52f16e2756323d1c1cb6..b16c3359792235a3fa3b66b14f5f2d839d931be3 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -180,21 +180,6 @@ struct dcerpc_pipe {
 /* specify binding interface */
 #define        DCERPC_LOCALADDRESS            (1<<22)
 
-/* this describes a binding to a particular transport/pipe */
-struct dcerpc_binding {
-       enum dcerpc_transport_t transport;
-       struct ndr_syntax_id object;
-       const char *host;
-       const char *target_hostname;
-       const char *target_principal;
-       const char *endpoint;
-       const char **options;
-       const char *localaddress;
-       uint32_t flags;
-       uint32_t assoc_group_id;
-};
-
-
 struct dcerpc_pipe_connect {
        struct dcerpc_pipe *pipe;
        struct dcerpc_binding *binding;