diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-26 09:31:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:47 -0500 |
| commit | f9fdeaa8f47585870b13f7dbe65b697ee8c7e9bb (patch) | |
| tree | 923af76fdaa0347fb92775f591520211c6ba58e7 /source4 | |
| parent | 4db039c3f33ff4119ced156f23786b1bcb73b5fd (diff) | |
| download | samba-f9fdeaa8f47585870b13f7dbe65b697ee8c7e9bb.tar.gz samba-f9fdeaa8f47585870b13f7dbe65b697ee8c7e9bb.tar.bz2 samba-f9fdeaa8f47585870b13f7dbe65b697ee8c7e9bb.zip | |
r3255: - fixed 2 uninitialised data errors found with valgrind
- fixed offset of setup words in nttrans reply
(This used to be commit 86b5118c2ae605560a196ee014b6134ec2928c5b)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_ioctl.c | 3 | ||||
| -rw-r--r-- | source4/smb_server/nttrans.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_ioctl.c b/source4/ntvfs/posix/pvfs_ioctl.c index 4feca8979f..3eb016c5b4 100644 --- a/source4/ntvfs/posix/pvfs_ioctl.c +++ b/source4/ntvfs/posix/pvfs_ioctl.c @@ -50,6 +50,7 @@ static NTSTATUS pvfs_ntioctl(struct ntvfs_module_context *ntvfs, case FSCTL_SET_SPARSE: /* maybe some posix systems have a way of marking a file non-sparse? */ + io->ntioctl.out.blob = data_blob(NULL, 0); return NT_STATUS_OK; } @@ -62,7 +63,7 @@ static NTSTATUS pvfs_ntioctl(struct ntvfs_module_context *ntvfs, NTSTATUS pvfs_ioctl(struct ntvfs_module_context *ntvfs, struct smbsrv_request *req, union smb_ioctl *io) { - NTSTATUS status; + NTSTATUS status = NT_STATUS_UNSUCCESSFUL; switch (io->generic.level) { case RAW_IOCTL_IOCTL: diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c index 9e2b16c30e..5a5d9f77e3 100644 --- a/source4/smb_server/nttrans.c +++ b/source4/smb_server/nttrans.c @@ -221,6 +221,8 @@ void reply_nttrans(struct smbsrv_request *req) req_grow_data(req, this_param + this_data + (align1 + align2)); + SSVAL(req->out.vwv, 0, 0); /* reserved */ + SCVAL(req->out.vwv, 2, 0); /* reserved */ SIVAL(req->out.vwv, 3, trans.out.params.length); SIVAL(req->out.vwv, 7, trans.out.data.length); @@ -235,7 +237,7 @@ void reply_nttrans(struct smbsrv_request *req) SCVAL(req->out.vwv, 35, trans.out.setup_count); for (i=0;i<trans.out.setup_count;i++) { - SSVAL(req->out.vwv, VWV(18+i)+1, trans.out.setup[i]); + SSVAL(req->out.vwv, VWV(18+i), trans.out.setup[i]); } memset(req->out.data, 0, align1); |