r16871: zero padding bytes

(found by valgrind)

metze
(This used to be commit 283bec8295b6302dfe3dc12c82d7870bdfee8b37)

diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index 67cad83c6d02b9b6ea82a0aadb0bc1d7905aa73a..38f4d12369a1bc65153ba6b8999d29ea629619f1 100644 (file)
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -234,6 +234,7 @@ NTSTATUS smb_raw_fileinfo_passthru_parse(const DATA_BLOB *blob, TALLOC_CTX *mem_
                parms->all_info2.out.nlink          = IVAL(blob->data, 0x38);
                parms->all_info2.out.delete_pending = CVAL(blob->data, 0x3C);
                parms->all_info2.out.directory      = CVAL(blob->data, 0x3D);
+               /* 0x3E-0x3F padding */
                parms->all_info2.out.file_id        = BVAL(blob->data, 0x40);
                parms->all_info2.out.ea_size        = IVAL(blob->data, 0x48);
                parms->all_info2.out.access_mask    = IVAL(blob->data, 0x4C);

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index a456e04b345c17bc0ce9234fc7a049a43357f21a..2cdf1aac05b49cdcb90e0289337b2743486d5a9d 100644 (file)
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -482,6 +482,7 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
                SIVAL(blob->data,       0x38, st->all_info2.out.nlink);
                SCVAL(blob->data,       0x3C, st->all_info2.out.delete_pending);
                SCVAL(blob->data,       0x3D, st->all_info2.out.directory);
+               SSVAL(blob->data,       0x3E, 0); /* padding */
                SBVAL(blob->data,       0x40, st->all_info2.out.file_id);
                SIVAL(blob->data,       0x48, st->all_info2.out.ea_size);
                SIVAL(blob->data,       0x4C, st->all_info2.out.access_mask);