[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Tue Sep 17 05:56:03 CEST 2013 

The branch, master has been updated
       via  6ef3c98 docs-xml: document SMB3_02 as available protocol for the client side
       via  4912378 s3:torture: add PROTOCOL_SMB3_02 handling
       via  66d3064 lib/param: add PROTOCOL_SMB3_02 handling
       via  f8b3c71 libcli/smb: negotiate SMB3_DIALECT_REVISION_302 if PROTOCOL_SMB3_02 is requested
       via  80623b8 libcli/smb: add PROTOCOL_SMB3_02
       via  4a401d6 libcli/smb: add SMB3_DIALECT_REVISION_302
      from  4dacaef dsdb: Use credentials.get_forced_sasl_mech()

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


- Log -----------------------------------------------------------------
commit 6ef3c98ade76e361d210366a0fe79fc3b66e63be
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Sep 15 17:09:35 2013 +0200

    docs-xml: document SMB3_02 as available protocol for the client side
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Sep 17 05:55:04 CEST 2013 on sn-devel-104

commit 491237840269943550bb0189c19a460d7a3cf0e7
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Sep 13 11:28:03 2013 +0200

    s3:torture: add PROTOCOL_SMB3_02 handling
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 66d3064333391bbd7e07e504c5d246498c1f748a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Sep 13 11:27:39 2013 +0200

    lib/param: add PROTOCOL_SMB3_02 handling
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f8b3c712f0dcb635bb750ebd218df77eeb584940
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Sep 13 11:27:01 2013 +0200

    libcli/smb: negotiate SMB3_DIALECT_REVISION_302 if PROTOCOL_SMB3_02 is requested
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 80623b8593700eb9b14e6d50b5687cc7d37de764
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Sep 13 11:26:20 2013 +0200

    libcli/smb: add PROTOCOL_SMB3_02
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 4a401d6fccfe75c34047427226bb1004e83a6563
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Sep 13 11:25:42 2013 +0200

    libcli/smb: add SMB3_DIALECT_REVISION_302
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 docs-xml/manpages/smb.conf.5.xml                   |    2 +-
 docs-xml/smbdotconf/protocol/clientmaxprotocol.xml |    3 +++
 lib/param/param_table.c                            |    1 +
 libcli/smb/smb2_constants.h                        |    1 +
 libcli/smb/smbXcli_base.c                          |    1 +
 libcli/smb/smb_constants.h                         |    5 +++--
 source3/torture/test_smb2.c                        |    3 +++
 7 files changed, 13 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 975d105..399e996 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -471,7 +471,7 @@ chmod 1770 /usr/local/samba/lib/usershares
 		<varlistentry>
 		<term>%R</term>
 		<listitem><para>the selected protocol level after protocol negotiation. It can be one of CORE, COREPLUS, 
-			LANMAN1, LANMAN2, NT1, SMB2_02, SMB2_10, SMB2_22, SMB2_24, SMB3_00 or SMB2_FF.</para></listitem>
+			LANMAN1, LANMAN2, NT1, SMB2_02, SMB2_10, SMB2_22, SMB2_24, SMB3_00, SMB3_02 or SMB2_FF.</para></listitem>
 		</varlistentry>
 
 		<varlistentry>
diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 06fda5a..c7a9fd1 100644
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -60,6 +60,9 @@
 		<listitem>
 		    <para><constant>SMB3_00</constant>: Windows 8 SMB3 version. (mostly the same as SMB2_24)</para>
 		</listitem>
+		<listitem>
+		    <para><constant>SMB3_02</constant>: Windows 8.1 SMB3 version.</para>
+		</listitem>
 	    </itemizedlist>
 	    <para>By default SMB3 selects the SMB3_00 variant.</para>
 	</listitem>
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7b32998..10cf046 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -30,6 +30,7 @@
 static const struct enum_list enum_protocol[] = {
 	{PROTOCOL_SMB2_10, "SMB2"}, /* for now keep PROTOCOL_SMB2_10 */
 	{PROTOCOL_SMB3_00, "SMB3"}, /* for now keep PROTOCOL_SMB3_00 */
+	{PROTOCOL_SMB3_02, "SMB3_02"},
 	{PROTOCOL_SMB3_00, "SMB3_00"},
 	{PROTOCOL_SMB2_24, "SMB2_24"},
 	{PROTOCOL_SMB2_22, "SMB2_22"},
diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index 54ab250..40a6339 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -96,6 +96,7 @@
 #define SMB2_DIALECT_REVISION_222       0x0222
 #define SMB2_DIALECT_REVISION_224       0x0224
 #define SMB3_DIALECT_REVISION_300       0x0300
+#define SMB3_DIALECT_REVISION_302       0x0302
 #define SMB2_DIALECT_REVISION_2FF       0x02FF
 
 /* SMB2 negotiate security_mode */
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 8cbf27a..7176e8f 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -3677,6 +3677,7 @@ static const struct {
 	{PROTOCOL_SMB2_22,	SMB2_DIALECT_REVISION_222},
 	{PROTOCOL_SMB2_24,	SMB2_DIALECT_REVISION_224},
 	{PROTOCOL_SMB3_00,	SMB3_DIALECT_REVISION_300},
+	{PROTOCOL_SMB3_02,	SMB3_DIALECT_REVISION_302},
 };
 
 struct smbXcli_negprot_state {
diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index 7144413..e1d888f 100644
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -86,9 +86,10 @@ enum protocol_types {
 	PROTOCOL_SMB2_10,
 	PROTOCOL_SMB2_22,
 	PROTOCOL_SMB2_24,
-	PROTOCOL_SMB3_00
+	PROTOCOL_SMB3_00,
+	PROTOCOL_SMB3_02
 };
-#define PROTOCOL_LATEST PROTOCOL_SMB3_00
+#define PROTOCOL_LATEST PROTOCOL_SMB3_02
 
 enum smb_signing_setting {
 	SMB_SIGNING_DEFAULT = -1,
diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 3bcd2ed..8cb1031 100644
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -256,6 +256,9 @@ bool run_smb2_negprot(int dummy)
 	case PROTOCOL_SMB3_00:
 		name = "SMB3_00";
 		break;
+	case PROTOCOL_SMB3_02:
+		name = "SMB3_02";
+		break;
 	default:
 		break;
 	}


-- 
Samba Shared Repository

More information about the samba-cvs mailing list