r26273: Add IDL and torture test for netr_NetrEnumerateTurstedDomains() and

netr_NetrEnumerateTurstedDomainsEx().

Guenther
(This used to be commit 32a189e85026f5b54f82df88306005d9a9f50beb)

1 files changed, 55 insertions, 44 deletions

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 190edcddbe..9743f74b34 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -903,7 +903,15 @@ interface netlogon
 
 	/*****************/
 	/* Function 0x13 */
-	WERROR netr_NETRENUMERATETRUSTEDDOMAINS() ;
+	typedef struct {
+		uint32 length;
+		[size_is(length)] uint8 *data;
+	} netr_Blob;
+
+	WERROR netr_NetrEnumerateTrustedDomains(
+		[in] [string,charset(UTF16)] uint16 *server_name,
+		[out,ref] netr_Blob *trusted_domains_blob
+		);
 
 	/*****************/
 	/* Function 0x14 */
@@ -1027,11 +1035,6 @@ interface netlogon
 	/****************/
 	/* Function 0x1d */
 
-	typedef struct {
-		uint32 length;
-		[size_is(length)] uint8 *data;
-	} netr_Blob;
-
 	typedef [flag(NDR_PAHEX)] struct {
 		uint16 length;
 		uint16 size;
@@ -1153,7 +1156,52 @@ interface netlogon
 
 	/****************/
 	/* Function 0x24 */
-	WERROR netr_NETRENUMERATETRUSTEDDOMAINSEX();
+	typedef [bitmap32bit] bitmap {
+		NETR_TRUST_FLAG_IN_FOREST = 0x00000001,
+		NETR_TRUST_FLAG_OUTBOUND  = 0x00000002,
+		NETR_TRUST_FLAG_TREEROOT  = 0x00000004,
+		NETR_TRUST_FLAG_PRIMARY   = 0x00000008,
+		NETR_TRUST_FLAG_NATIVE    = 0x00000010,
+		NETR_TRUST_FLAG_INBOUND   = 0x00000020
+	} netr_TrustFlags;
+
+	typedef [v1_enum] enum {
+		NETR_TRUST_TYPE_DOWNLEVEL	= 1,
+		NETR_TRUST_TYPE_UPLEVEL		= 2,
+		NETR_TRUST_TYPE_MIT		= 3,
+		NETR_TRUST_TYPE_DCE		= 4
+	} netr_TrustType;
+
+	typedef [bitmap32bit] bitmap {
+		NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE	= 0x00000001,
+		NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY       = 0x00000002,
+		NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN = 0x00000004,
+		NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE  = 0x00000008,
+		NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION = 0x00000010,
+		NETR_TRUST_ATTRIBUTE_WITHIN_FOREST      = 0x00000020,
+		NETR_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL  = 0x00000040
+	} netr_TrustAttributes;
+
+	typedef struct {
+		[string,charset(UTF16)] uint16			*netbios_name;
+		[string,charset(UTF16)] uint16			*dns_name;
+		netr_TrustFlags		trust_flags;
+		uint32			parent_index;
+		netr_TrustType		trust_type;
+		netr_TrustAttributes	trust_attributes;
+		dom_sid2		*sid;
+		GUID			guid;
+	} netr_DomainTrust;
+
+        typedef struct {
+                uint32 count;
+                [size_is(count)] netr_DomainTrust *array;
+        } netr_DomainTrustList;
+
+	WERROR netr_NetrEnumerateTrustedDomainsEx(
+		[in] [string,charset(UTF16)] uint16 *server_name,
+		[out,ref] netr_DomainTrustList *dom_trust_list
+	);
 
 	/****************/
 	/* Function 0x25 */
@@ -1199,43 +1247,6 @@ interface netlogon
 	/****************/
 	/* Function 0x28 */
 
-	typedef [bitmap32bit] bitmap {
-		NETR_TRUST_FLAG_IN_FOREST = 0x00000001,
-		NETR_TRUST_FLAG_OUTBOUND  = 0x00000002,
-		NETR_TRUST_FLAG_TREEROOT  = 0x00000004,
-		NETR_TRUST_FLAG_PRIMARY   = 0x00000008,
-		NETR_TRUST_FLAG_NATIVE    = 0x00000010,
-		NETR_TRUST_FLAG_INBOUND   = 0x00000020
-	} netr_TrustFlags;
-
-	typedef [v1_enum] enum {
-		NETR_TRUST_TYPE_DOWNLEVEL	= 1,
-		NETR_TRUST_TYPE_UPLEVEL		= 2,
-		NETR_TRUST_TYPE_MIT		= 3,
-		NETR_TRUST_TYPE_DCE		= 4
-	} netr_TrustType;
-
-	typedef [bitmap32bit] bitmap {
-		NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE	= 0x00000001,
-		NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY       = 0x00000002,
-		NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN = 0x00000004,
-		NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE  = 0x00000008,
-		NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION = 0x00000010,
-		NETR_TRUST_ATTRIBUTE_WITHIN_FOREST      = 0x00000020,
-		NETR_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL  = 0x00000040
-	} netr_TrustAttributes;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16			*netbios_name;
-		[string,charset(UTF16)] uint16			*dns_name;
-		netr_TrustFlags		trust_flags;
-		uint32			parent_index;
-		netr_TrustType		trust_type;
-		netr_TrustAttributes	trust_attributes;
-		dom_sid2		*sid;
-		GUID			guid;
-	} netr_DomainTrust;
-
 	WERROR netr_DsrEnumerateDomainTrusts(
 		[in]                 [string,charset(UTF16)] uint16           *server_name,
 		[in]                 netr_TrustFlags  trust_flags,