* fixed lsa_LookupPrivName

* added levels 2 and 3 of dfs_Enum
(This used to be commit 3fa61c19826cd1415f561e1e5c40adcc59d4abf2)

2 files changed, 39 insertions, 7 deletions

diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
index 19781568a3..27efc5b221 100644
--- a/source4/librpc/idl/dfs.idl
+++ b/source4/librpc/idl/dfs.idl
@@ -49,16 +49,49 @@
 	/* Function: 0x05 */
 
 	typedef struct {
-		unistr *str;
-	} dfs_String;
+		unistr *path;
+	} dfs_Info1;
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] dfs_String *s;
-	} dfs_Enum1;
+		[size_is(count)] dfs_Info1 *s;
+	} dfs_EnumArray1;
+
+	typedef struct {
+		unistr *path;
+		unistr *comment;
+		uint32 state;
+		uint32 num_stores;
+	} dfs_Info2;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] dfs_Info2 *s;
+	} dfs_EnumArray2;
+
+	typedef struct {
+		uint32 state;
+		unistr *server;
+		unistr *share;
+	} dfs_StorageInfo;
+
+	typedef struct {
+		unistr *path;
+		unistr *comment;
+		uint32 state;
+		uint32 num_stores;
+		[size_is(num_stores)] dfs_StorageInfo *stores;
+	} dfs_Info3;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] dfs_Info3 *s;
+	} dfs_EnumArray3;
 
 	typedef union {
-		case(1) dfs_Enum1 *enum1;
+		case(1) dfs_EnumArray1 *info1;
+		case(2) dfs_EnumArray2 *info2;
+		case(3) dfs_EnumArray3 *info3;
 	} dfs_EnumInfo;
 
 	typedef struct {
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index ce6a151f42..e86ff5f4d3 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -376,8 +376,7 @@
 	/* Function:      0x20 */
 	NTSTATUS lsa_LookupPrivName (
 		[in,ref]     policy_handle *handle,
-		[in]         uint32 luid_high,
-		[in]         uint32 luid_low,
+		[in,ref]     lsa_LUID *luid,
 		[out]        lsa_Name *name
 		);