added 4 more levels to samr_QueryDisplayInfo()

(This used to be commit f4cc593a5c7d75adaced2c33dd83c2ec741751be)

2 files changed, 45 insertions, 5 deletions

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index 925896fbe1..031ca89821 100644
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -48,4 +48,11 @@ interface misc
 		[relative] security_acl *dacl; /* user (discretionary) ACL */
 	} security_descriptor;
 
+	/* we declare this noprint so we can supply
+	   a nicer pretty-print routine */
+	typedef [public, noprint] struct {
+		uint8 data[20];
+	} policy_handle;
+
+
 }
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index d639af82db..29ba402503 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -657,18 +657,51 @@
 		uint32    idx;
 		uint32    rid;
 		uint32    acct_flags;
-		samr_Name username;
+		samr_Name account_name;
 		samr_Name full_name;
 		samr_Name description;
-	} samr_DispEntry1;
+	} samr_DispEntryGeneral;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] samr_DispEntryGeneral *entries;
+	} samr_DispInfoGeneral;
+
+	typedef struct {
+		uint32    idx;
+		uint32    rid;
+		uint32    acct_flags;
+		samr_Name account_name;
+		samr_Name description;
+	} samr_DispEntryFull;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] samr_DispEntryFull *entries;
+	} samr_DispInfoFull;
+
+	typedef struct {
+		[value(strlen_m(r->name))] uint16 name_len;
+		[value(strlen_m(r->name))] uint16 name_size;
+		ascstr *name;
+	} samr_AsciiName;	
+
+	typedef struct {
+		uint32    idx;
+		samr_AsciiName account_name;
+	} samr_DispEntryAscii;
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] samr_DispEntry1 *entries;
-	} samr_DispInfo1;
+		[size_is(count)] samr_DispEntryAscii *entries;
+	} samr_DispInfoAscii;
 
 	typedef union {
-		[case(1)] samr_DispInfo1 info1;
+		[case(1)] samr_DispInfoGeneral info1;/* users */
+		[case(2)] samr_DispInfoFull info2; /* trust accounts? */
+		[case(3)] samr_DispInfoFull info3; /* groups */
+		[case(4)] samr_DispInfoAscii info4; /* users */
+		[case(5)] samr_DispInfoAscii info5; /* groups */
 	} samr_DispInfo;
 
 	NTSTATUS samr_QueryDisplayInfo(