param: change the effective default for "client max protocol" to the latest supported...

Currently it's SMB3_11.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 0131331b876efd1bf6fa302ad547d8d9980ba94e..eba18bfb80a8a1f01dc70535b19d08471ca706cb 100644 (file)
--- 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 9f32d7b27b0be2815beb2b79b77a8e96672ff4b9..3ceea50b279a22e34376ffc140c9916518533896 100644 (file)
--- 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 91fa85ea7b08b42a204b01d7e07ca71679a47dce..8f0cf5e6e0311b47af6b66103e174423994f6a6c 100644 (file)
--- 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;
 }