smbd: Offer SMB 3.1.1 by default.

Pair-Programmed-With: Michael Adam <obnox@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri May  8 15:49:32 CEST 2015 on sn-devel-104

diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index b6dae59b2425f47289505c8369f608e3fc66f683..e68226fb3da02ed4730c6e95ee2ae36c4ff07f08 100644 (file)
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -70,7 +70,7 @@
                    <para><constant>SMB3_11</constant>: Windows 10 technical preview SMB3 version (maybe final).</para>
                </listitem>
            </itemizedlist>
-           <para>By default SMB3 selects the SMB3_02 variant.</para>
+           <para>By default SMB3 selects the SMB3_11 variant.</para>
        </listitem>
     </itemizedlist>
 

diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 33a49ccc4e443a08a55b93cf15208f76a8807e3c..7321d22314cf95e241775d39d0e807ace886fae4 100644 (file)
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -59,7 +59,7 @@
                    <para><constant>SMB3_11</constant>: Windows 10 technical preview SMB3 version (maybe final).</para>
                </listitem>
            </itemizedlist>
-           <para>By default SMB3 selects the SMB3_02 variant.</para>
+           <para>By default SMB3 selects the SMB3_11 variant.</para>
        </listitem>
     </itemizedlist>
 

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 78ea80b36e81bd9a01a11a82222691ee3b6dc24e..287839fb7d3482e5b0d96043c664a8344d7dceb0 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -40,7 +40,7 @@
 static const struct enum_list enum_protocol[] = {
        {PROTOCOL_DEFAULT, "default"}, /* the caller decides what this means */
        {PROTOCOL_SMB2_10, "SMB2"}, /* for now keep PROTOCOL_SMB2_10 */
-       {PROTOCOL_SMB3_02, "SMB3"}, /* for now keep PROTOCOL_SMB3_02 */
+       {PROTOCOL_SMB3_11, "SMB3"}, /* for now keep PROTOCOL_SMB3_11 */
        {PROTOCOL_SMB3_11, "SMB3_11"},
        {PROTOCOL_SMB3_10, "SMB3_10"},
        {PROTOCOL_SMB3_02, "SMB3_02"},

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d5b6b811aa8558c39c0935e1b6447088c327e62b..6f8e145c6fbce636de8b676dd6feba1c7d019dc6 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -643,7 +643,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.large_readwrite = true;
        Globals.max_log_size = 5000;
        Globals.max_open_files = max_open_files();
-       Globals.server_max_protocol = PROTOCOL_SMB3_02;
+       Globals.server_max_protocol = PROTOCOL_SMB3_11;
        Globals.server_min_protocol = PROTOCOL_LANMAN1;
        Globals._client_max_protocol = PROTOCOL_DEFAULT;
        Globals.client_min_protocol = PROTOCOL_CORE;