[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f1dc8b2 s3: smb_request->vwv can be const
      from  6f8f24c selftest: Do not skip environments that fail to start up

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f1dc8b28b7323aa5d44df6bd8d1fbcece91cc397
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 23 10:50:46 2012 +0100

    s3: smb_request->vwv can be const
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Thu Feb 23 12:37:23 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/include/smb.h  |    2 +-
 source3/smbd/process.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 7dd77ec..10e4798 100644
--- 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 139f1f0..3cb44c4 100644
--- 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;


-- 
Samba Shared Repository