s3: smb_request->vwv can be const

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Thu Feb 23 12:37:23 CET 2012 on sn-devel-104

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 7dd77ec5da5696b869a8ab46ab23155698e16e2d..10e47984a806e3bdfbcb8de96c3b0d9e43cd6d63 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -452,7 +452,7 @@ struct smb_request {
        uint16 vuid;
        uint16 tid;
        uint8  wct;
-       uint16_t *vwv;
+       const uint16_t *vwv;
        uint16_t buflen;
        const uint8_t *buf;
        const uint8 *inbuf;

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 139f1f0d2222a3d9bce5df7c090067f5a7e9ca6d..3cb44c4137a32e65358228078200211e513fdc46 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -529,7 +529,7 @@ static bool init_smb_request(struct smb_request *req,
        req->vuid   = SVAL(inbuf, smb_uid);
        req->tid    = SVAL(inbuf, smb_tid);
        req->wct    = CVAL(inbuf, smb_wct);
-       req->vwv    = discard_const_p(uint16_t, (inbuf+smb_vwv));
+       req->vwv    = (const uint16_t *)(inbuf+smb_vwv);
        req->buflen = smb_buflen(inbuf);
        req->buf    = (const uint8_t *)smb_buf_const(inbuf);
        req->unread_bytes = unread_bytes;