r18676: Don't mix ShareInfo and ShareCtr definitions,

this makes a much more readable include file
(This used to be commit e3b157af9f870c4c2423095c5ccb1bbcaf3faa61)

1 files changed, 51 insertions, 51 deletions

diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index b62a3827d1..6ee470b5a6 100644
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -402,22 +402,12 @@
 	} srvsvc_NetShareInfo0;
 
 	typedef struct {
-		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo0 *array;
-	} srvsvc_NetShareCtr0;
-
-	typedef struct {
 		[string,charset(UTF16)] uint16 *name;
 		srvsvc_ShareType type;
 		[string,charset(UTF16)] uint16 *comment;
 	} srvsvc_NetShareInfo1;
 
 	typedef struct {
-		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo1 *array;
-	} srvsvc_NetShareCtr1;
-
-	typedef struct {
 		[string,charset(UTF16)] uint16 *name;
 		srvsvc_ShareType type;
 		[string,charset(UTF16)] uint16 *comment;
@@ -429,11 +419,6 @@
 	} srvsvc_NetShareInfo2;
 
 	typedef struct {
-		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo2 *array;
-	} srvsvc_NetShareCtr2;
-
-	typedef struct {
 		[string,charset(UTF16)] uint16 *name;
 		srvsvc_ShareType type;
 		[string,charset(UTF16)] uint16 *comment;
@@ -441,11 +426,6 @@
 	} srvsvc_NetShareInfo501;
 
 	typedef struct {
-		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo501 *array;
-	} srvsvc_NetShareCtr501;
-
-	typedef struct {
 		[string,charset(UTF16)] uint16 *name;
 		srvsvc_ShareType type;
 		[string,charset(UTF16)] uint16 *comment;
@@ -460,18 +440,12 @@
 	} srvsvc_NetShareInfo502;
 
 	typedef struct {
-		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo502 *array;
-	} srvsvc_NetShareCtr502;
-
-	typedef struct {
 		[string,charset(UTF16)] uint16 *comment;
 	} srvsvc_NetShareInfo1004;
 
 	typedef struct {
-		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo1004 *array;
-	} srvsvc_NetShareCtr1004;
+		int32 max_users;
+	} srvsvc_NetShareInfo1006;
 
 	typedef bitmap {
 		SHARE_1005_IN_DFS               = 0x00000001,
@@ -486,23 +460,63 @@
 	} srvsvc_NetShareInfo1005;
 
 	typedef struct {
+		uint32 flags;
+		[string,charset(UTF16)] uint16 *alternate_directory_name;
+	} srvsvc_NetShareInfo1007;
+
+	typedef union {
+		[case(0)] srvsvc_NetShareInfo0 *info0;
+		[case(1)] srvsvc_NetShareInfo1 *info1;
+		[case(2)] srvsvc_NetShareInfo2 *info2;
+		[case(501)] srvsvc_NetShareInfo501 *info501;
+		[case(502)] srvsvc_NetShareInfo502 *info502;
+		[case(1004)] srvsvc_NetShareInfo1004 *info1004;
+		[case(1005)] srvsvc_NetShareInfo1005 *info1005;
+		[case(1006)] srvsvc_NetShareInfo1006 *info1006;
+		[case(1007)] srvsvc_NetShareInfo1007 *info1007;
+		[case(1501)] sec_desc_buf *info1501;
+		[default] ;
+	} srvsvc_NetShareInfo;
+
+	typedef struct {
 		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo1005 *array;
-	} srvsvc_NetShareCtr1005;
+		[size_is(count)] srvsvc_NetShareInfo0 *array;
+	} srvsvc_NetShareCtr0;
 
 	typedef struct {
-		int32 max_users;
-	} srvsvc_NetShareInfo1006;
+		uint32 count;
+		[size_is(count)] srvsvc_NetShareInfo1 *array;
+	} srvsvc_NetShareCtr1;
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] srvsvc_NetShareInfo1006 *array;
-	} srvsvc_NetShareCtr1006;
+		[size_is(count)] srvsvc_NetShareInfo2 *array;
+	} srvsvc_NetShareCtr2;
 
 	typedef struct {
-		uint32 flags;
-		[string,charset(UTF16)] uint16 *alternate_directory_name;
-	} srvsvc_NetShareInfo1007;
+		uint32 count;
+		[size_is(count)] srvsvc_NetShareInfo501 *array;
+	} srvsvc_NetShareCtr501;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] srvsvc_NetShareInfo502 *array;
+	} srvsvc_NetShareCtr502;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] srvsvc_NetShareInfo1004 *array;
+	} srvsvc_NetShareCtr1004;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] srvsvc_NetShareInfo1005 *array;
+	} srvsvc_NetShareCtr1005;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] srvsvc_NetShareInfo1006 *array;
+	} srvsvc_NetShareCtr1006;
 
 	typedef struct {
 		uint32 count;
@@ -515,20 +529,6 @@
 	} srvsvc_NetShareCtr1501;
 
 	typedef union {
-		[case(0)] srvsvc_NetShareInfo0 *info0;
-		[case(1)] srvsvc_NetShareInfo1 *info1;
-		[case(2)] srvsvc_NetShareInfo2 *info2;
-		[case(501)] srvsvc_NetShareInfo501 *info501;
-		[case(502)] srvsvc_NetShareInfo502 *info502;
-		[case(1004)] srvsvc_NetShareInfo1004 *info1004;
-		[case(1005)] srvsvc_NetShareInfo1005 *info1005;
-		[case(1006)] srvsvc_NetShareInfo1006 *info1006;
-		[case(1007)] srvsvc_NetShareInfo1007 *info1007;
-		[case(1501)] sec_desc_buf *info1501;
-		[default] ;
-	} srvsvc_NetShareInfo;
-
-	typedef union {
 		[case(0)] srvsvc_NetShareCtr0 *ctr0;
 		[case(1)] srvsvc_NetShareCtr1 *ctr1;
 		[case(2)] srvsvc_NetShareCtr2 *ctr2;