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)

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;