diff options
| author | Jeremy Allison <jra@samba.org> | 2012-03-07 11:58:51 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-03-07 22:41:21 +0100 |
| commit | 9788d6a3489ff5df0de43ce9fabc35b20df52bb1 (patch) | |
| tree | 7545e0d2b1150da36d48ed26d3919469d982596b | |
| parent | 0c3474b45e9ed8ad85bc524fa131033123da2d51 (diff) | |
| download | samba-9788d6a3489ff5df0de43ce9fabc35b20df52bb1.tar.gz samba-9788d6a3489ff5df0de43ce9fabc35b20df52bb1.tar.bz2 samba-9788d6a3489ff5df0de43ce9fabc35b20df52bb1.zip | |
Change default protocol to SMB2_02.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Mar 7 22:41:21 CET 2012 on sn-devel-104
| -rw-r--r-- | docs-xml/smbdotconf/protocol/maxprotocol.xml | 20 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/docs-xml/smbdotconf/protocol/maxprotocol.xml b/docs-xml/smbdotconf/protocol/maxprotocol.xml index 3648a5ecb0..2ecf84675d 100644 --- a/docs-xml/smbdotconf/protocol/maxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/maxprotocol.xml @@ -35,8 +35,22 @@ </listitem> <listitem> <para><constant>SMB2</constant>: Re-implementation of the SMB protocol. - Used by Windows Vista and newer. The Samba implementation of SMB2 is - currently marked experimental!</para> + Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available.</para> + <itemizedlist> + <listitem> + <para><constant>SMB2_02</constant>: The earliest SMB2 version.</para> + </listitem> + <listitem> + <para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para> + </listitem> + <listitem> + <para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para> + </listitem> + <listitem> + <para><constant>SMB2_24</constant>: Windows 8 SMB2 version.</para> + </listitem> + </itemizedlist> + <para>By default SMB2 selects the SMB2_02 varient.</para> </listitem> </itemizedlist> @@ -48,6 +62,6 @@ <related>min protocol</related> <synonym>protocol</synonym> -<value type="default">NT1</value> +<value type="default">SMB2</value> <value type="example">LANMAN1</value> </samba:parameter> diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 453c8fd875..f4e01335c5 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4766,7 +4766,7 @@ static void init_globals(bool reinit_globals) Globals.max_log_size = 5000; Globals.max_open_files = max_open_files(); Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE; - Globals.srv_maxprotocol = PROTOCOL_NT1; + Globals.srv_maxprotocol = PROTOCOL_SMB2_02; Globals.srv_minprotocol = PROTOCOL_CORE; Globals.security = SEC_USER; Globals.paranoid_server_security = true; |