sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

librpc: use DATA_BLOB in CFDATA structure

Browse Source 
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Aurelien Aptel 2017-05-23 15:31:44 +02:00 committed by Jeremy Allison
parent 1edf126693
commit 466d5e8147
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librpc/idl/cab.idl
View File

@ -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 {

2
librpc/ndr/ndr_cab.c
View File

@ -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),

6
source4/torture/ndr/cabinet.c
View File

@ -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;
}