added the dfs_GetInfo all - all levels

(This used to be commit 638eae6bae76eba5494e75fb7f3da8b1c205f892)

1 files changed, 63 insertions, 38 deletions

diff --git a/source4/librpc/ndr/ndr_dfs.h b/source4/librpc/ndr/ndr_dfs.h
index 23c84e5b53..c36477cd20 100644
--- a/source4/librpc/ndr/ndr_dfs.h
+++ b/source4/librpc/ndr/ndr_dfs.h
@@ -48,29 +48,10 @@ struct dfs_UNKNOWN3 {
 
 };
 
-struct dfs_Info {
-	struct {
-		const char *path;
-		const char *server;
-		const char *share;
-		uint16 level;
-	} in;
-
-	struct {
-		NTSTATUS result;
-	} out;
-
-};
-
 struct dfs_Info1 {
 	const char *path;
 };
 
-struct dfs_EnumArray1 {
-	uint32 count;
-	struct dfs_Info1 *s;
-};
-
 struct dfs_Info2 {
 	const char *path;
 	const char *comment;
@@ -78,11 +59,6 @@ struct dfs_Info2 {
 	uint32 num_stores;
 };
 
-struct dfs_EnumArray2 {
-	uint32 count;
-	struct dfs_Info2 *s;
-};
-
 struct dfs_StorageInfo {
 	uint32 state;
 	const char *server;
@@ -97,11 +73,6 @@ struct dfs_Info3 {
 	struct dfs_StorageInfo *stores;
 };
 
-struct dfs_EnumArray3 {
-	uint32 count;
-	struct dfs_Info3 *s;
-};
-
 struct dfs_Info4 {
 	const char *path;
 	const char *comment;
@@ -112,18 +83,20 @@ struct dfs_Info4 {
 	struct dfs_StorageInfo *stores;
 };
 
-struct dfs_EnumArray4 {
-	uint32 count;
-	struct dfs_Info4 *s;
+struct dfs_Info100 {
+	const char *comment;
 };
 
-struct dfs_Info200 {
-	const char *dom_root;
+struct dfs_Info101 {
+	uint32 state;
 };
 
-struct dfs_EnumArray200 {
-	uint32 count;
-	struct dfs_Info200 *s;
+struct dfs_Info102 {
+	uint32 timeout;
+};
+
+struct dfs_Info200 {
+	const char *dom_root;
 };
 
 struct dfs_Info300 {
@@ -131,6 +104,58 @@ struct dfs_Info300 {
 	const char *dom_root;
 };
 
+union dfs_Info {
+/* [case(1)] */ struct dfs_Info1 *info1;
+/* [case(2)] */ struct dfs_Info2 *info2;
+/* [case(3)] */ struct dfs_Info3 *info3;
+/* [case(4)] */ struct dfs_Info4 *info4;
+/* [case(100)] */ struct dfs_Info100 *info100;
+/* [case(101)] */ struct dfs_Info101 *info101;
+/* [case(102)] */ struct dfs_Info102 *info102;
+/* [case(200)] */ struct dfs_Info200 *info200;
+/* [case(300)] */ struct dfs_Info300 *info300;
+};
+
+struct dfs_GetInfo {
+	struct {
+		const char *path;
+		const char *server;
+		const char *share;
+		uint32 level;
+	} in;
+
+	struct {
+		union dfs_Info info;
+		NTSTATUS result;
+	} out;
+
+};
+
+struct dfs_EnumArray1 {
+	uint32 count;
+	struct dfs_Info1 *s;
+};
+
+struct dfs_EnumArray2 {
+	uint32 count;
+	struct dfs_Info2 *s;
+};
+
+struct dfs_EnumArray3 {
+	uint32 count;
+	struct dfs_Info3 *s;
+};
+
+struct dfs_EnumArray4 {
+	uint32 count;
+	struct dfs_Info4 *s;
+};
+
+struct dfs_EnumArray200 {
+	uint32 count;
+	struct dfs_Info200 *s;
+};
+
 struct dfs_EnumArray300 {
 	uint32 count;
 	struct dfs_Info300 *s;
@@ -171,5 +196,5 @@ struct dfs_Enum {
 #define DCERPC_DFS_ADD 1
 #define DCERPC_DFS_REMOVE 2
 #define DCERPC_DFS_UNKNOWN3 3
-#define DCERPC_DFS_INFO 4
+#define DCERPC_DFS_GETINFO 4
 #define DCERPC_DFS_ENUM 5