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

[Karolin Seeger]

The branch, v4-6-test has been updated
       via  925aa47 VERSION: Bump version up to 4.6.3.
       via  dd75f39 Merge tag 'samba-4.6.2' into v4-6-test
       via  36d0070 VERSION: Disable GIT_SNAPSHOTS for the 4.6.2 release.
       via  8f35980 WHATSNEW: Add release notes for 4.6.2.
       via  2b9a812 s3: Test for CVE-2017-2619 regression with "follow symlinks = no" - part 2
       via  9e81c83 s3: smbd: Fix "follow symlink = no" regression part 2.
       via  9e2ce69 s3: smbd: Fix "follow symlink = no" regression part 2.
       via  076f01e s3: Fixup test for CVE-2017-2619 regression with "follow symlinks = no"
       via  5a573c2 s3: Test for CVE-2017-2619 regression with "follow symlinks = no".
       via  faea234 s3: smbd: Fix incorrect logic exposed by fix for the security bug 12496 (CVE-2017-2619).
       via  7b7f6a0 VERSION: Re-enable GIT_SNAPSHOTS.
       via  6cd0b59 VERSION: Bump version up to 4.6.2.
      from  cf02564 s3: Test for CVE-2017-2619 regression with "follow symlinks = no" - part 2

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -----------------------------------------------------------------
commit 925aa47db2e7ca194443a189c750f6285c816a26
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Mar 31 10:18:05 2017 +0200

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

commit dd75f3945f689fc639f4f5bf70294c63b12210ae
Merge: cf02564 36d0070
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Mar 31 10:17:48 2017 +0200

    Merge tag 'samba-4.6.2' into v4-6-test
    
    samba: tag release samba-4.6.2

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

Summary of changes:
 VERSION                   |  2 +-
 WHATSNEW.txt              | 45 +++++++++++++++++++++++++++++++++++++++++++--
 selftest/target/Samba3.pm |  4 ++++
 3 files changed, 48 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 3a831c8..e197b1f 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=4
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=2
+SAMBA_VERSION_RELEASE=3
 
 ########################################################
 # If a official release has a serious bug              #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 02935d7..a5feff8 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,45 @@
                    =============================
+                   Release Notes for Samba 4.6.2
+                           March 31, 2017
+                   =============================
+
+
+This is a bug fix release to address a regression introduced by the security
+fixes for CVE-2017-2619 (Symlink race allows access outside share definition).
+Please see https://bugzilla.samba.org/show_bug.cgi?id=12721 for details.
+
+
+Changes since 4.6.1:
+--------------------
+
+o  Jeremy Allison <jra at samba.org>
+   * BUG 12721: Fix regression with "follow symlinks = no".
+
+
+#######################################
+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.1 and newer" 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.6.1
                            March 23, 2017
                    =============================
@@ -66,8 +107,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
 		   ==============================
                    Release Notes for Samba 4.6.0
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index d7b8d77..7722a5e 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1861,6 +1861,10 @@ sub provision($$$$$$$$)
 	copy = tmp
 	acl_xattr:ignore system acls = yes
 	acl_xattr:default acl style = posix
+[nosymlinks]
+	copy = tmp
+	path = $nosymlinks_shrdir
+	follow symlinks = no
 [acl_xattr_ign_sysacl_windows]
 	copy = tmp
 	acl_xattr:ignore system acls = yes


-- 
Samba Shared Repository