Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit f008c3b6ee324056fd9b63f6151ad6849640c959)

1 files changed, 8 insertions, 25 deletions

diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index b0cddfcdf9..eb85989eda 100644
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -401,7 +401,7 @@ interface drsblobs {
 		[case(TRUST_AUTH_TYPE_VERSION)] AuthInfoVersion version;
 	} AuthInfo;
 
-	typedef struct {
+	typedef [public] struct {
 		NTTIME LastUpdateTime;
 		trustAuthType AuthType;
 		
@@ -422,32 +422,15 @@ interface drsblobs {
 		[flag(NDR_ALIGN4)] DATA_BLOB _pad;
 	} AuthenticationInformation;
 
-	typedef struct {
-		AuthenticationInformation info[1];
-	} AuthenticationInformation1;
-
-	typedef struct {
-		AuthenticationInformation info[2];
-	} AuthenticationInformation2;
-
-	typedef struct {
-		[relative] AuthenticationInformation1 *current;
-		[relative] AuthenticationInformation1 *previous;
-	} AuthenticationInformationCtr1;
-
-	typedef struct {
-		[relative] AuthenticationInformation2 *current;
-		[relative] AuthenticationInformation2 *previous;
-	} AuthenticationInformationCtr2;
+	typedef [nopull,nopush,noprint] struct {
+		/* sizeis here is bogus, but this is here just for the structure */
+		[size_is(1)] AuthenticationInformation array[];
+	} AuthenticationInformationArray;
 
-	typedef [nodiscriminant] union {
-		[case(1)] AuthenticationInformationCtr1 info1;
-		[case(2)] AuthenticationInformationCtr2 info2;
-	} AuthenticationInformationCtr;
-
-	typedef [public] struct {
+	typedef [public,nopull,nopush,noprint] struct {
 		uint32 count;
-		[switch_is(count)] AuthenticationInformationCtr auth;
+		[relative] AuthenticationInformationArray *current;
+		[relative] AuthenticationInformationArray *previous;
 	} trustAuthInOutBlob;
 
 	void decode_trustAuthInOut(