idl: frsrpc depends on bkupblobs.idl and fscc.idl

Change-Id: I6ce1f4b28752765e7bc59c9eb7474ebd68d9b399
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/librpc/idl/frsrpc.idl b/librpc/idl/frsrpc.idl
index 8e1f109067864cda40da75e6f7add24e9b2c38ac..bd361a3962c3a8177c3e3cac0ab7a2c93f82722b 100644 (file)
--- 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 1bac9a74d2b48d16762aebf902eeaecf1202feb0..3838b33656a636342a71192872380cc11988d1ee 100644 (file)
--- 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 404bd53071874dae57439fb0252a08dd8c1e3b80..f39dbf5b62cbb433850cddab52987ba3aea31a9f 100644 (file)
--- 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 5b53b6fdeb416a66df227599f703f32bfaceac10..b5e67c1a510be47e9e2c9bbd4e4bf854bdb34987 100755 (executable)
--- 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'
         )