[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  03e9c64 VERSION: Bump version up to 4.0.22.
       via  13ccfd2 Merge tag 'samba-4.0.21' into v4-0-test
       via  2ec2bd6 VERSION: Disable git snapshots for the 4.0.21 release.
       via  170540b WHATSNEW: Add release notes for Samba 4.0.21.
       via  fb1d325 fix unstrcpy
       via  97fa00c VERSION: Bump version number up to 4.0.21...
      from  00fe8eb VERSION: Bump version number up to 4.0.21...

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


- Log -----------------------------------------------------------------
commit 03e9c64e219729cad41c7488aa08fbc9a26ce09c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Aug 1 13:16:31 2014 +0200

    VERSION: Bump version up to 4.0.22.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit 13ccfd24ffb7db7e5f3405b2050378085ba59ab9
Merge: 00fe8eb4c86c4c1c4a2fbedb07e6813cb9002487 2ec2bd60863a80367be9c8b11e080ac718056796
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Aug 1 13:14:43 2014 +0200

    Merge tag 'samba-4.0.21' into v4-0-test
    
    samba: tag release samba-4.0.21

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

Summary of changes:
 VERSION                    |    2 +-
 WHATSNEW.txt               |   53 ++++++++++++++++++++++++++++++++++++++++++-
 lib/util/string_wrappers.h |    2 +-
 3 files changed, 53 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 24882cb..9299b98 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=4
 SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=21
+SAMBA_VERSION_RELEASE=22
 
 ########################################################
 # If a official release has a serious bug              #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 49640f6..58e3986 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,53 @@
                    ==============================
+                   Release Notes for Samba 4.0.21
+                           August 1, 2014
+                   ==============================
+
+
+This is a security release in order to address
+CVE-2014-3560 (Remote code execution in nmbd).
+
+o  CVE-2014-3560:
+   Samba 4.0.0 to 4.1.10 are affected by a remote code execution attack on
+   unauthenticated nmbd NetBIOS name services.
+
+   A malicious browser can send packets that may overwrite the heap of
+   the target nmbd NetBIOS name services daemon. It may be possible to
+   use this to generate a remote code execution vulnerability as the
+   superuser (root).
+
+
+Changes since 4.1.20:
+---------------------
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 10735: CVE-2014-3560: Fix unstrcpy macro length.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 4.0 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
+                   ==============================
                    Release Notes for Samba 4.0.20
                            July 30, 2014
                    ==============================
@@ -72,8 +121,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    ==============================
                    Release Notes for Samba 4.0.19
diff --git a/lib/util/string_wrappers.h b/lib/util/string_wrappers.h
index 5f9d568..243fafc 100644
--- a/lib/util/string_wrappers.h
+++ b/lib/util/string_wrappers.h
@@ -51,7 +51,7 @@ do { \
 #define unstrcpy(d,s) \
 do { \
 	const char *_unstrcpy_src = (const char *)(s); \
-	strlcpy((d),_unstrcpy_src ? _unstrcpy_src : "",sizeof(fstring)); \
+	strlcpy((d),_unstrcpy_src ? _unstrcpy_src : "",sizeof(unstring)); \
 } while (0)
 
 #ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS


-- 
Samba Shared Repository