diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-10-13 11:01:59 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2015-05-08 13:00:28 +0200 |
| commit | 8a56fab24d04a46ba5641c7211d9cefb6b6720d2 (patch) | |
| tree | e23eab72cbc96d2eb391857e408ba3b4f0149c39 | |
| parent | 4481fea86a95df2abe558b67c31f4c86db75910a (diff) | |
| download | samba-8a56fab24d04a46ba5641c7211d9cefb6b6720d2.tar.gz | |
s3:smb2_negprot: add support for negotiating SMB 3.1.0 and SMB 3.1.1
Note: SMB 3.1.0 was used in a early preview versions of Windows 10.
Was later superseded by 3.1.1.
Pair-Programmed-With: Michael Adam <obnox@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 6 | ||||
| -rw-r--r-- | source3/smbd/smb2_negprot.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml index 66bc3f8da5b..33a49ccc4e4 100644 --- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml @@ -52,6 +52,12 @@ <listitem> <para><constant>SMB3_02</constant>: Windows 8.1 SMB3 version.</para> </listitem> + <listitem> + <para><constant>SMB3_10</constant>: early Windows 10 technical preview SMB3 version.</para> + </listitem> + <listitem> + <para><constant>SMB3_11</constant>: Windows 10 technical preview SMB3 version (maybe final).</para> + </listitem> </itemizedlist> <para>By default SMB3 selects the SMB3_02 variant.</para> </listitem> diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 199dc147ab6..63bac9ef819 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -92,6 +92,8 @@ enum protocol_types smbd_smb2_protocol_dialect_match(const uint8_t *indyn, enum protocol_types proto; uint16_t dialect; } pd[] = { + { PROTOCOL_SMB3_11, SMB3_DIALECT_REVISION_311 }, + { PROTOCOL_SMB3_10, SMB3_DIALECT_REVISION_310 }, { PROTOCOL_SMB3_02, SMB3_DIALECT_REVISION_302 }, { PROTOCOL_SMB3_00, SMB3_DIALECT_REVISION_300 }, { PROTOCOL_SMB2_24, SMB2_DIALECT_REVISION_224 }, |