summaryrefslogtreecommitdiff
path: root/source4/librpc/idl
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-08-18 06:57:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:02:11 -0500
commitce84ab9a83441845202e99f8ffd4512839926024 (patch)
treef77e855f39947f4078d6ab160d212db0758aba08 /source4/librpc/idl
parentfb19fe7a512db0da16b9dfe226f51d99b86df0a6 (diff)
downloadsamba-ce84ab9a83441845202e99f8ffd4512839926024.tar.gz
samba-ce84ab9a83441845202e99f8ffd4512839926024.tar.bz2
samba-ce84ab9a83441845202e99f8ffd4512839926024.zip
r24532: rename struct dcerpc_syntax_id into struct ndr_syntax_id
and move it into misc.idl The goal is to get rid a all dcerpc specific stuff in the generated ndr layer. metze (This used to be commit 2ed014cfb894cccab1654e3f7d5876393e2b52d7)
Diffstat (limited to 'source4/librpc/idl')
-rw-r--r--source4/librpc/idl/dcerpc.idl11
-rw-r--r--source4/librpc/idl/mgmt.idl6
-rw-r--r--source4/librpc/idl/misc.idl5
3 files changed, 11 insertions, 11 deletions
diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl
index 75fd051ef1..c864bd4b39 100644
--- a/source4/librpc/idl/dcerpc.idl
+++ b/source4/librpc/idl/dcerpc.idl
@@ -12,16 +12,11 @@ import "misc.idl";
interface dcerpc
{
- typedef [public] struct {
- GUID uuid;
- uint32 if_version;
- } dcerpc_syntax_id;
-
typedef struct {
uint16 context_id;
uint8 num_transfer_syntaxes;
- dcerpc_syntax_id abstract_syntax;
- dcerpc_syntax_id transfer_syntaxes[num_transfer_syntaxes];
+ ndr_syntax_id abstract_syntax;
+ ndr_syntax_id transfer_syntaxes[num_transfer_syntaxes];
} dcerpc_ctx_list;
typedef struct {
@@ -62,7 +57,7 @@ interface dcerpc
typedef struct {
uint16 result;
uint16 reason;
- dcerpc_syntax_id syntax;
+ ndr_syntax_id syntax;
} dcerpc_ack_ctx;
typedef struct {
diff --git a/source4/librpc/idl/mgmt.idl b/source4/librpc/idl/mgmt.idl
index 8aae05e953..60d1ebdc85 100644
--- a/source4/librpc/idl/mgmt.idl
+++ b/source4/librpc/idl/mgmt.idl
@@ -11,12 +11,12 @@
interface mgmt
{
typedef struct {
- dcerpc_syntax_id *id;
- } dcerpc_syntax_id_p;
+ ndr_syntax_id *id;
+ } ndr_syntax_id_p;
typedef struct {
uint32 count;
- [size_is(count)] dcerpc_syntax_id_p if_id[*];
+ [size_is(count)] ndr_syntax_id_p if_id[*];
} rpc_if_id_vector_t;
diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index 2b099a6164..0861758187 100644
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -17,6 +17,11 @@ interface misc
} GUID;
typedef [public] struct {
+ GUID uuid;
+ uint32 if_version;
+ } ndr_syntax_id;
+
+ typedef [public] struct {
uint32 handle_type;
GUID uuid;
} policy_handle;