librpc: use DATA_BLOB in CFDATA structure

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/librpc/idl/cab.idl b/librpc/idl/cab.idl
index 2174bce73343a11cefaafa109c053719b9c6b569..9f3a02c231c6bed3baaa96ee9f553523c87b40b1 100644 (file)
--- a/librpc/idl/cab.idl
+++ b/librpc/idl/cab.idl
@@ -117,7 +117,7 @@ import "misc.idl";
 #if 0
                uint8 abReserve[];      /* (optional) per-datablock reserved area */
 #endif
-               uint8 ab[cbData];       /* compressed data bytes */
+               DATA_BLOB ab;   /* compressed data bytes */
        } CFDATA;
 
        typedef [nopush,nopull,public,flag(NDR_PAHEX|NDR_LITTLE_ENDIAN|NDR_NOALIGN)] struct {

diff --git a/librpc/ndr/ndr_cab.c b/librpc/ndr/ndr_cab.c
index 110206855be9c4eee7226195d744ce00b6bf7fe3..2399a2248a663efaecdb0b762e647f435c9f630c 100644 (file)
--- a/librpc/ndr/ndr_cab.c
+++ b/librpc/ndr/ndr_cab.c
@@ -109,7 +109,7 @@ uint32_t ndr_cab_generate_checksum(const struct CFDATA *r)
 {
        uint32_t csumPartial;
 
-       csumPartial = ndr_cab_compute_checksum(&r->ab[0], r->cbData, 0);
+       csumPartial = ndr_cab_compute_checksum(&r->ab.data[0], r->cbData, 0);
 
        return ndr_cab_compute_checksum((uint8_t *)discard_const(&r->cbData),
                                        sizeof(r->cbData) + sizeof(r->cbUncomp),

diff --git a/source4/torture/ndr/cabinet.c b/source4/torture/ndr/cabinet.c
index 25fe373c842e667c7910c9c560dcc4516805d3c8..790f7c37f11977edd3317570f4cb6b71013b53ef 100644 (file)
--- a/source4/torture/ndr/cabinet.c
+++ b/source4/torture/ndr/cabinet.c
@@ -4171,7 +4171,7 @@ static bool cab_file_plain_check(struct torture_context *tctx,
        blob = data_blob(NULL, r->cfdata[0].cbUncomp);
        memset(blob.data, 'A', blob.length);
 
-       torture_assert_mem_equal(tctx, r->cfdata[0].ab, blob.data, blob.length, "ab");
+       torture_assert_data_blob_equal(tctx, r->cfdata[0].ab, blob, "ab");
 
        return true;
 }
@@ -4235,7 +4235,7 @@ static bool cab_file_MSZIP_check(struct torture_context *tctx,
        memset(blob.data, 'A', blob.length);
 #if 0
        /* once we have MSZIP compression working we can enable this test */
-       torture_assert_data_blob_equal(tctx, r->cfdata[0].mszip_data.ab, blob, "ab");
+       torture_assert_data_blob_equal(tctx, r->cfdata[0].ab, blob, "ab");
 #endif
        return true;
 }
@@ -4304,7 +4304,7 @@ static bool cab_file_LZX_check(struct torture_context *tctx,
        memset(blob.data, 'A', blob.length);
 #if 0
        /* once we have LZX compression support we can enable this test */
-       torture_assert_data_blob_equal(tctx, r->cfdata[0].mszip_data.ab, blob, "ab");
+       torture_assert_data_blob_equal(tctx, r->cfdata[0].ab, blob, "ab");
 #endif
        return true;
 }