>From 9a39e2fbb99b2858cf36b11424df2f7f927fda32 Mon Sep 17 00:00:00 2001
From: Matthieu Patou <mat@matws.net>
Date: Wed, 18 Jul 2012 08:55:26 -0700
Subject: [PATCH 5/9] idl: frsrpc depends on bkupblobs.idl and fscc.idl

---
 librpc/idl/frsrpc.idl        | 30 +++++++++++++++++++++++++++---
 librpc/idl/wscript_build     |  2 +-
 librpc/wscript_build         | 10 ++++++++++
 source4/librpc/wscript_build |  2 +-
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/librpc/idl/frsrpc.idl b/librpc/idl/frsrpc.idl
index 8e1f109..bd361a3 100644
--- a/librpc/idl/frsrpc.idl
+++ b/librpc/idl/frsrpc.idl
@@ -1,6 +1,8 @@
 #include "idl_types.h"
 
 import "misc.idl";
+import "fscc.idl";
+import "bkupblobs.idl";
 
 [
   uuid("f5cc59b4-4264-101a-8c59-08002b2f8426"),
@@ -12,6 +14,7 @@ import "misc.idl";
 ] 
 interface frsrpc
 {
+
 	/*****************/
 	/* Function 0x00 */
 
@@ -115,7 +118,7 @@ interface frsrpc
 		FRSRPC_CO_LOCATION_DIR_NO_CMD	= 0x0000000e | 0x00000001
 	} frsrpc_CommPktCoCmdLocationCmd;
 
-	typedef struct {
+	[public] typedef struct {
 		uint32 sequence_number;
 		frsrpc_CommPktCoCmdFlags flags;
 		frsrpc_CommPktCoCmdIFlags iflags;
@@ -202,7 +205,7 @@ interface frsrpc
 		frsrpc_CommPktCoRecordExtensionMajor major;
 		[value(0x0002)] uint16 offset_count;
 		[value(0x00000018)] uint32 offset0;
-		[value(0x00000030)] uint32 offset1;/*TODO: is this correct??? */
+		[value(0x00000030)] uint32 offset1;
 		[value(0)] uint32 offset_last;
 		[value(0)] uint32 not_used;
 		frsrpc_CommPktDataExtensionChecksum data_checksum;
@@ -293,7 +296,7 @@ interface frsrpc
 		[case(FRSRPC_COMM_PKT_CHUNK_CO_GUID)][subcontext(4)]
 			GUID co_guid;
 		[case(FRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER)]
-			uint32 co_sequnence_number;
+			uint32 co_sequence_number;
 		[case(FRSRPC_COMM_PKT_CHUNK_REMOTE_CO)][subcontext(4)]
 			frsrpc_CommPktChangeOrderCommand remote_co;
 		[case(FRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K)][subcontext(4)]
@@ -388,6 +391,27 @@ interface frsrpc
 			GUID *parent_guid
 	);
 
+	typedef [public,flag(NDR_NOALIGN)] struct {
+		uint32 major;
+		uint32 minor;
+		uint32 dataHigh;
+		uint32 dataLow;
+		uint16 compression;
+		uint8 unused[6];
+		fscc_FileNetworkOpenInformation attributes;
+		frsrpc_CommPktChangeOrderCommand command;
+		fscc_FileObjectIdBuffer_2 fileObjId;
+		frsrpc_CommPktCoRecordExtensionWin2k cocExt;
+		GUID compressionGuid;
+		uint32 encDataHigh;
+		uint32 encDataLow;
+		hyper dataSize;
+		uint32 reparseDataPresent;
+		uint32 reparseDataHigh;
+		uint32 reparseDataLow;
+		uint32 padding2;
+	} frsrpc_StageHeader;
+
 	/*****************/
 	/* Function 0x03 */
 	WERROR frsrpc_FrsNOP();
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 1bac9a7..3838b33 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
                        notify.idl
                        smb2_lease_struct.idl
                        policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
-                       fsrvp.idl witness.idl''',
+                       fsrvp.idl bkupblobs.idl fscc.idl witness.idl''',
                     options='--header --ndr-parser --samba3-ndr-server --server --client --python',
                     output_dir='../gen_ndr')
 
diff --git a/librpc/wscript_build b/librpc/wscript_build
index a815aa1..79b3972 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -80,6 +80,16 @@ bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
     public_deps='ndr'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_BKUPBLOBS',
+	source='gen_ndr/ndr_bkupblobs.c',
+	public_deps='ndr'
+	)
+
+bld.SAMBA_SUBSYSTEM('NDR_FSCC',
+	source='gen_ndr/ndr_fscc.c',
+	public_deps='ndr'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
     source='gen_ndr/ndr_policyagent.c',
     public_deps='ndr'
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 5b53b6f..b5e67c1 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -82,7 +82,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
         NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
         NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
         NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP
-        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG''',
+        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_BKUPBLOBS NDR_FSCC''',
         depends_on='GEN_NDR_TABLES'
         )
 
-- 
2.1.0