The branch, v3-6-test has been updated via e00a2c9 s3: smb2 server - fix bug 10167 smb2 breaks "smb encryption = mandatory via b63dbd7 WHATSNEW: Start release notes for Samba 3.6.20. via ca43d23 VERSION: Bump version up to 3.6.20. from 153fe12 WHATSNEW: Prepare release notes for Samba 3.6.19.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit e00a2c90847b3c85f089b4f3c96ec6c66b949576 Author: Jeremy Allison <j...@samba.org> Date: Thu Sep 26 02:55:19 2013 -0700 s3: smb2 server - fix bug 10167 smb2 breaks "smb encryption = mandatory Refuse an SMB2 tcon on a share wher eencryption is required. SMB2 doesn't support this. Signed-off-by: Jeremy Allison <j...@samba.org> commit b63dbd748636adfe5c98050133b14c2b61396d11 Author: Karolin Seeger <ksee...@samba.org> Date: Wed Oct 2 09:18:08 2013 +0200 WHATSNEW: Start release notes for Samba 3.6.20. Signed-off-by: Karolin Seeger <ksee...@samba.org> commit ca43d23fb64735f35c9865e306f82bd31d4730c9 Author: Karolin Seeger <ksee...@samba.org> Date: Wed Oct 2 09:12:42 2013 +0200 VERSION: Bump version up to 3.6.20. Signed-off-by: Karolin Seeger <ksee...@samba.org> ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 46 ++++++++++++++++++++++++++++++++++++++++++++-- source3/VERSION | 2 +- source3/smbd/smb2_tcon.c | 9 +++++++++ 3 files changed, 54 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 711c225..d30b702 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,45 @@ ============================== + Release Notes for Samba 3.6.20 + November 06, 2013 + ============================== + + +This is is the latest maintenance release of Samba 3.6. + +Please note that this will probably be the last maintenance release +of the Samba 3.6 release series. With the release of Samba 4.1.0, the +3.6 release series will be turned into the "security fixes only" mode. + + +Changes since 3.6.19: +--------------------- + +o Jeremy Allison <j...@samba.org> + + +###################################################################### +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 3.6 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 3.6.19 September 25, 2013 ============================== @@ -70,8 +111,9 @@ database (https://bugzilla.samba.org/). == The Samba Team ====================================================================== -Release notes for older releases follow: ----------------------------------------- + +---------------------------------------------------------------------- + ============================== Release Notes for Samba 3.6.18 diff --git a/source3/VERSION b/source3/VERSION index 55d1574..59857d2 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=19 +SAMBA_VERSION_RELEASE=20 ######################################################## # Bug fix releases use a letter for the patch revision # diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c index 5f0e3a9..8b955ff 100644 --- a/source3/smbd/smb2_tcon.c +++ b/source3/smbd/smb2_tcon.c @@ -207,6 +207,15 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, return NT_STATUS_BAD_NETWORK_NAME; } + /* Don't allow connection if encryption is required. */ + if (lp_smb_encrypt(snum) == Required) { + DEBUG(0,("Connection refused on share %s as encryption is" + " required on this share and SMB2 does not support" + " this.\n", + lp_servicename(snum))); + return NT_STATUS_ACCESS_DENIED; + } + /* create a new tcon as child of the session */ tcon = talloc_zero(req->session, struct smbd_smb2_tcon); if (tcon == NULL) { -- Samba Shared Repository