summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-26 09:31:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:47 -0500
commitf9fdeaa8f47585870b13f7dbe65b697ee8c7e9bb (patch)
tree923af76fdaa0347fb92775f591520211c6ba58e7 /source4/smb_server
parent4db039c3f33ff4119ced156f23786b1bcb73b5fd (diff)
downloadsamba-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/smb_server')
-rw-r--r--source4/smb_server/nttrans.c4
1 files changed, 3 insertions, 1 deletions
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);