samba: backport default to SMB3_11 from Samba 4.7

This commit is contained in:
chewitt 2017-07-21 08:15:26 +01:00
parent 2f03fcb23d
commit d48c3d8f50

View File

@ -0,0 +1,55 @@
From 1199907cbe2f003a7df6f56e6cf3878d0732344d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 26 Jun 2017 10:00:53 +0200
Subject: [PATCH] param: change the effective default for "client max protocol"
to the latest supported protocol
Currently it's SMB3_11.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---
docs-xml/smbdotconf/protocol/clientmaxprotocol.xml | 2 +-
lib/param/loadparm.c | 2 +-
source3/param/loadparm.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 0131331b876..eba18bfb80a 100644
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -79,7 +79,7 @@
negotiation phase in the SMB protocol takes care of choosing
the appropriate protocol.</para>
- <para>The value <constant>default</constant> refers to <constant>NT1</constant>.</para>
+ <para>The value <constant>default</constant> refers to <constant>SMB3_11</constant>.</para>
<para>IPC$ connections for DCERPC e.g. in winbindd, are handled by the
<smbconfoption name="client ipc max protocol"/> option.</para>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 9f32d7b27b0..3ceea50b279 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -3401,7 +3401,7 @@ int lpcfg_client_max_protocol(struct loadparm_context *lp_ctx)
{
int client_max_protocol = lpcfg__client_max_protocol(lp_ctx);
if (client_max_protocol == PROTOCOL_DEFAULT) {
- return PROTOCOL_NT1;
+ return PROTOCOL_LATEST;
}
return client_max_protocol;
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 91fa85ea7b0..8f0cf5e6e03 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4543,7 +4543,7 @@ int lp_client_max_protocol(void)
{
int client_max_protocol = lp__client_max_protocol();
if (client_max_protocol == PROTOCOL_DEFAULT) {
- return PROTOCOL_NT1;
+ return PROTOCOL_LATEST;
}
return client_max_protocol;
}