From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 6 Jun 2019 12:07:13 +0000 (+0200)
Subject: docs-xml: change "client min protocol" to SMB2_02
X-Git-Tag: samba-4.11.0rc1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3264b1f317d6c603cc72eb2a150fe244c47aa3ac;p=thirdparty%2Fsamba.git

docs-xml: change "client min protocol" to SMB2_02

It's time to disable SMB1 by default...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/docs-xml/smbdotconf/protocol/clientminprotocol.xml b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
index fb8f87e4016..1eb07adc0c2 100644
--- a/docs-xml/smbdotconf/protocol/clientminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
@@ -9,13 +9,17 @@
 
 	<para>Normally this option should not be set as the automatic
 	negotiation phase in the SMB protocol takes care of choosing
-	the appropriate protocol.</para>
+	the appropriate protocol unless you connect to a legacy SMB1-only server.</para>
 
 	<para>See <related>client max protocol</related> for a full list
 	of available protocols.</para>
 
 	<para>IPC$ connections for DCERPC e.g. in winbindd, are handled by the
 	<smbconfoption name="client ipc min protocol"/> option.</para>
+
+	<para>Note that most command line tools support
+	--option='client min protocol=NT1', so it may not be required to
+	enable SMB1 protocols globally in smb.conf.</para>
 </description>
 
 <related>client max protocol</related>
@@ -23,6 +27,6 @@
 <related>client ipc min protocol</related>
 <related>client ipc max protocol</related>
 
-<value type="default">CORE</value>
+<value type="default">SMB2_02</value>
 <value type="example">NT1</value>
 </samba:parameter>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index f3f06b69db8..18b65e5fe59 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2713,7 +2713,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 	lpcfg_do_global_parameter(lp_ctx, "LargeReadwrite", "True");
 	lpcfg_do_global_parameter(lp_ctx, "server min protocol", "SMB2_02");
 	lpcfg_do_global_parameter(lp_ctx, "server max protocol", "SMB3");
-	lpcfg_do_global_parameter(lp_ctx, "client min protocol", "CORE");
+	lpcfg_do_global_parameter(lp_ctx, "client min protocol", "SMB2_02");
 	lpcfg_do_global_parameter(lp_ctx, "client max protocol", "default");
 	lpcfg_do_global_parameter(lp_ctx, "client ipc min protocol", "default");
 	lpcfg_do_global_parameter(lp_ctx, "client ipc max protocol", "default");
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index afb35696b0f..a52c25fef0a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -648,7 +648,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
 	Globals.server_max_protocol = PROTOCOL_SMB3_11;
 	Globals.server_min_protocol = PROTOCOL_SMB2_02;
 	Globals._client_max_protocol = PROTOCOL_DEFAULT;
-	Globals.client_min_protocol = PROTOCOL_CORE;
+	Globals.client_min_protocol = PROTOCOL_SMB2_02;
 	Globals._client_ipc_max_protocol = PROTOCOL_DEFAULT;
 	Globals._client_ipc_min_protocol = PROTOCOL_DEFAULT;
 	Globals._security = SEC_AUTO;