diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-07-08 08:18:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:55 -0500 |
| commit | bb158b74da65edc5ed8ed9fdbcb77ffae373df2e (patch) | |
| tree | 1357a0c3fdda1c9ca3a46bb8dc4000b5e20c54d3 | |
| parent | f0f7070ad70c73a1e5c2cf7c5111e39c372845cd (diff) | |
| download | samba-bb158b74da65edc5ed8ed9fdbcb77ffae373df2e.tar.gz samba-bb158b74da65edc5ed8ed9fdbcb77ffae373df2e.tar.bz2 samba-bb158b74da65edc5ed8ed9fdbcb77ffae373df2e.zip | |
r16871: zero padding bytes
(found by valgrind)
metze
(This used to be commit 283bec8295b6302dfe3dc12c82d7870bdfee8b37)
| -rw-r--r-- | source4/libcli/raw/rawfileinfo.c | 1 | ||||
| -rw-r--r-- | source4/smb_server/blob.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c index 67cad83c6d..38f4d12369 100644 --- 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 a456e04b34..2cdf1aac05 100644 --- 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); |