[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  b7d5b46... s3: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send
       via  262854d... WHATSNEW: Prepare release notes for Samba 3.5.0.
       via  e8979e7... VERSION: Raise version number up to 3.5.0.
      from  8b05660... WHATSNEW: Update changes since 3.5.0rc2.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit b7d5b469ef134d60e1f795f66f7e5c3ef23d7971
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Feb 21 20:39:36 2010 +0100

    s3: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send
    
    I hate macros....
    (cherry picked from commit 65914ed8194b141a44516d626e71a1851bccff5f)
    
    Fix bug #7166.

commit 262854d8a2a39df2d151268442772ad92b0ddbcd
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Feb 22 15:44:34 2010 +0100

    WHATSNEW: Prepare release notes for Samba 3.5.0.
    
    Karolin

commit e8979e7edd42ec229cc7d53f636c99a09b97fde4
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Feb 22 15:40:57 2010 +0100

    VERSION: Raise version number up to 3.5.0.
    
    Karolin

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

Summary of changes:
 WHATSNEW.txt               |   16 +++++++++-------
 source3/VERSION            |    2 +-
 source3/libsmb/async_smb.c |    3 ++-
 3 files changed, 12 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1d99e4e..4b5c64d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,13 +1,11 @@
+                   =============================
+                   Release Notes for Samba 3.5.0
+			    March 1, 2010
                    ===============================
-                   Release Notes for Samba 3.5.0rc3
-			  February 19, 2010
-                   ===============================
 
 
-This is the third release candidate of Samba 3.5.  This is *not*
-intended for production environments and is designed for testing
-purposes only.  Please report any defects via the Samba bug reporting
-system at https://bugzilla.samba.org/.
+This is the first stable release of Samba 3.5.
+
 
 Major enhancements in Samba 3.5.0 include:
 
@@ -129,6 +127,10 @@ o   Stefan Metzmacher <metze at samba.org>
     * Implement the new SMB2 protocol (experimental).
 
 
+Changes since 3.5.0rc3
+----------------------
+
+
 Changes since 3.5.0rc2
 ----------------------
 
diff --git a/source3/VERSION b/source3/VERSION
index 993f176..dbf57df 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=3
+SAMBA_VERSION_RC_RELEASE=
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8b9cf09..e8a0b13 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -476,7 +476,8 @@ static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
 	if (state->mid != 0) {
 		SSVAL(iov[0].iov_base, smb_mid, state->mid);
 	} else {
-		SSVAL(iov[0].iov_base, smb_mid, cli_alloc_mid(state->cli));
+		uint16_t mid = cli_alloc_mid(state->cli);
+		SSVAL(iov[0].iov_base, smb_mid, mid);
 	}
 
 	smb_setlen((char *)iov[0].iov_base, iov_len(iov, iov_count) - 4);


-- 
Samba Shared Repository