summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-03-13 14:10:42 +0100
committerStefan Metzmacher <metze@samba.org>2011-03-13 16:53:05 +0100
commit08dca92499c5bd17402dda14521edb4256476639 (patch)
tree83486512168abb16cfbe4eed6b766d051ab08746
parent7b7baecf1ab2f783ae90b68884fb034d25e9f798 (diff)
downloadsamba-08dca92499c5bd17402dda14521edb4256476639.tar.gz
samba-08dca92499c5bd17402dda14521edb4256476639.tar.bz2
samba-08dca92499c5bd17402dda14521edb4256476639.zip
librpc/rpc: move struct dcerpc_binding to rpc_common.h
metze
-rw-r--r--librpc/rpc/rpc_common.h14
-rw-r--r--source3/librpc/rpc/dcerpc.h15
-rw-r--r--source4/librpc/rpc/dcerpc.h15
3 files changed, 14 insertions, 30 deletions
diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
index 69ee69411a..f940c3f234 100644
--- 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 4f449c6a77..354c6829a2 100644
--- 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 fe3ce93d67..b16c335979 100644
--- 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;