librpc/rpc: move enum dcerpc_transport_t to rpc_common.h

metze

diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
index 5d1bde00e0918044fcfc423716bc11d28b0c487e..69ee69411a725b84a725dde266313abe296a5d8b 100644 (file)
--- a/librpc/rpc/rpc_common.h
+++ b/librpc/rpc/rpc_common.h
@@ -29,9 +29,15 @@ struct ndr_interface_call;
 struct ndr_push;
 struct ndr_pull;
 struct ncacn_packet;
+struct epm_floor;
 struct tevent_context;
 struct tstream_context;
 
+enum dcerpc_transport_t {
+       NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, 
+       NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, 
+       NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
+
 /* 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 3cfd229f33bebe77b7a6771cb746d11dc6e0c009..52f93abeca4d14bd684d36fe713402a4c8f19fec 100644 (file)
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -23,15 +23,12 @@
  * If you remove any functions or change their signature, update 
  * the so version number. */
 
-#ifndef __DCERPC_H__
-#define __DCERPC_H__
+#ifndef _S3_DCERPC_H__
+#define _S3_DCERPC_H__
 
-#define SMB_RPC_INTERFACE_VERSION 1
+#include "../librpc/rpc/rpc_common.h"
 
-enum dcerpc_transport_t {
-       NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, 
-       NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, 
-       NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
+#define SMB_RPC_INTERFACE_VERSION 1
 
 /** this describes a binding to a particular transport/pipe */
 struct dcerpc_binding {
@@ -162,6 +159,4 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
                           DATA_BLOB *raw_pkt,
                           size_t *pad_len);
 
-#include "../librpc/rpc/rpc_common.h"
-
-#endif /* __DCERPC_H__ */
+#endif /* __S3_DCERPC_H__ */

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index eb0dbee49e8b918d33c58d8f1122b9c50bbac2f5..fe3ce93d67e09f95622a52f16e2756323d1c1cb6 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -24,23 +24,19 @@
  * If you remove any functions or change their signature, update 
  * the so version number. */
 
-#ifndef __DCERPC_H__
-#define __DCERPC_H__
+#ifndef __S4_DCERPC_H__
+#define __S4_DCERPC_H__
 
 #include "../lib/util/data_blob.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "../librpc/ndr/libndr.h"
+#include "../librpc/rpc/rpc_common.h"
 
 struct tevent_context;
 struct tevent_req;
 struct dcerpc_binding_handle;
 struct tstream_context;
 
-enum dcerpc_transport_t {
-       NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, 
-       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 defines a generic security context for signed/sealed dcerpc pipes.
 */
@@ -383,6 +379,4 @@ enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
 
 const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
 
-#include "../librpc/rpc/rpc_common.h"
-
-#endif /* __DCERPC_H__ */
+#endif /* __S4_DCERPC_H__ */