svn commit: samba r3255 - in branches/SAMBA_4_0/source: ntvfs/posix
smb_server
tridge at samba.org
tridge at samba.org
Tue Oct 26 09:31:12 GMT 2004
Author: tridge
Date: 2004-10-26 09:31:11 +0000 (Tue, 26 Oct 2004)
New Revision: 3255
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=3255&nolog=1
Log:
- fixed 2 uninitialised data errors found with valgrind
- fixed offset of setup words in nttrans reply
Modified:
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c
branches/SAMBA_4_0/source/smb_server/nttrans.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c 2004-10-26 08:41:12 UTC (rev 3254)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c 2004-10-26 09:31:11 UTC (rev 3255)
@@ -50,6 +50,7 @@
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 @@
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:
Modified: branches/SAMBA_4_0/source/smb_server/nttrans.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/nttrans.c 2004-10-26 08:41:12 UTC (rev 3254)
+++ branches/SAMBA_4_0/source/smb_server/nttrans.c 2004-10-26 09:31:11 UTC (rev 3255)
@@ -221,6 +221,8 @@
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 @@
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);
More information about the samba-cvs
mailing list