From: Garming Sam <garming@catalyst.net.nz>
Date: Thu, 5 Feb 2015 05:17:58 +0000 (+1300)
Subject: backupkey: Improve IDL
X-Git-Tag: samba-4.2.0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9372640c64dee2c0c6a56afdba8f7f8964309df6;p=thirdparty%2Fsamba.git

backupkey: Improve IDL

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit bc0b90a300654a248a08e4796133bb6b880e9789)
---

diff --git a/librpc/idl/backupkey.idl b/librpc/idl/backupkey.idl
index 18098cd0a6a..76c0eb7d8ab 100644
--- a/librpc/idl/backupkey.idl
+++ b/librpc/idl/backupkey.idl
@@ -99,19 +99,19 @@ interface backupkey
 	} bkrp_access_check_v3;
 
 	[public] typedef struct {
-		[subcontext(0),subcontext_size(32),flag(NDR_REMAINING)] DATA_BLOB r3;
-		[subcontext(0),subcontext_size(20),flag(NDR_REMAINING)] DATA_BLOB mac;
+		uint8 r3[32];
+		uint8 mac[20];
 		dom_sid sid;
-		[subcontext(0),flag(NDR_REMAINING)] DATA_BLOB secret;
+		[subcontext(0),flag(NDR_REMAINING)] DATA_BLOB secret_data;
 	} bkrp_rc4encryptedpayload;
 
 	[public] typedef struct {
 		[value(0x00000001)] uint32 magic;
 		uint32 payload_length;
-		uint32 cyphertext_length;
-		[subcontext(0),subcontext_size(16),flag(NDR_REMAINING)] DATA_BLOB guid_of_wrapping_key;
-		[subcontext(0),subcontext_size(68),flag(NDR_REMAINING)] DATA_BLOB r2;
-		[subcontext(0),flag(NDR_REMAINING)] DATA_BLOB rc4encryptedpayload;
+		uint32 ciphertext_length;
+		GUID guid;
+		uint8 r2[68];
+		uint8 rc4encryptedpayload[ciphertext_length];
 	} bkrp_server_side_wrapped;
 
 	[public] typedef struct {