[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Tue Feb 28 19:09:03 MST 2012


The branch, master has been updated
       via  de870e9 s3: Introduce "req" helper var in reply_lockingX_success
       via  adac885 s3: Fix a const warning
      from  c5c67ca s3: Add a test that makes a chained open break an oplock

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


- Log -----------------------------------------------------------------
commit de870e979b1082ffd4d88350dfd4e073bd5d0789
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 28 02:47:46 2012 +0100

    s3: Introduce "req" helper var in reply_lockingX_success
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Wed Feb 29 03:08:53 CET 2012 on sn-devel-104

commit adac8858817c1a153fecb3b02b59cbffc23ec1cb
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 28 03:14:37 2012 +0100

    s3: Fix a const warning

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

Summary of changes:
 source3/smbd/blocking.c |    8 +++++---
 source3/smbd/process.c  |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 028adce..6496e43 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -268,7 +268,9 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
 
 static void reply_lockingX_success(struct blocking_lock_record *blr)
 {
-	reply_outbuf(blr->req, 2, 0);
+	struct smb_request *req = blr->req;
+
+	reply_outbuf(req, 2, 0);
 
 	/*
 	 * As this message is a lockingX call we must handle
@@ -278,8 +280,8 @@ static void reply_lockingX_success(struct blocking_lock_record *blr)
 	 * that here and must set up the chain info manually.
 	 */
 
-	chain_reply(blr->req);
-	TALLOC_FREE(blr->req->outbuf);
+	chain_reply(req);
+	TALLOC_FREE(req->outbuf);
 }
 
 /****************************************************************************
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ba6314c..fc18f5e 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1784,7 +1784,7 @@ static bool smb_splice_chain(uint8_t **poutbuf, const uint8_t *andx_buf)
 	uint8_t wct		= CVAL(andx_buf, smb_wct);
 	const uint16_t *vwv	= (const uint16_t *)(andx_buf + smb_vwv);
 	uint32_t num_bytes	= smb_buflen(andx_buf);
-	const uint8_t *bytes	= (const uint8_t *)smb_buf(andx_buf);
+	const uint8_t *bytes	= (const uint8_t *)smb_buf_const(andx_buf);
 
 	uint8_t *outbuf;
 	size_t old_size, new_size;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list