smbd: offer SMB 3.0.2 by default.
authorMichael Adam <obnox@samba.org>
Wed, 6 May 2015 09:30:11 +0000 (11:30 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 8 May 2015 11:00:28 +0000 (13:00 +0200)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
docs-xml/smbdotconf/protocol/servermaxprotocol.xml
lib/param/param_table.c
source3/param/loadparm.c

index 1ca9b93667ae0026fa622c2092d8c57d850eb8eb..b6dae59b2425f47289505c8369f608e3fc66f683 100644 (file)
@@ -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_00 variant.</para>
+           <para>By default SMB3 selects the SMB3_02 variant.</para>
        </listitem>
     </itemizedlist>
 
index dcc78f25732398bddf8d272b64326ed16594f243..66bc3f8da5b14eba169985ab6ccb2f3bb84fad5d 100644 (file)
@@ -53,7 +53,7 @@
                    <para><constant>SMB3_02</constant>: Windows 8.1 SMB3 version.</para>
                </listitem>
            </itemizedlist>
-           <para>By default SMB3 selects the SMB3_00 variant.</para>
+           <para>By default SMB3 selects the SMB3_02 variant.</para>
        </listitem>
     </itemizedlist>
 
index 9b806393e02fcf8613e10a5f6ecfa9716dc4814e..78ea80b36e81bd9a01a11a82222691ee3b6dc24e 100644 (file)
@@ -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_00, "SMB3"}, /* for now keep PROTOCOL_SMB3_00 */
+       {PROTOCOL_SMB3_02, "SMB3"}, /* for now keep PROTOCOL_SMB3_02 */
        {PROTOCOL_SMB3_11, "SMB3_11"},
        {PROTOCOL_SMB3_10, "SMB3_10"},
        {PROTOCOL_SMB3_02, "SMB3_02"},
index a81a20a7478f84a0c31e98bef8ee055d298879c1..d5b6b811aa8558c39c0935e1b6447088c327e62b 100644 (file)
@@ -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_00;
+       Globals.server_max_protocol = PROTOCOL_SMB3_02;
        Globals.server_min_protocol = PROTOCOL_LANMAN1;
        Globals._client_max_protocol = PROTOCOL_DEFAULT;
        Globals.client_min_protocol = PROTOCOL_CORE;