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 | 02b223ced398f40a016db83d41ad1581512002d1 (patch) | |
| tree | 950bc8263907fd39ed29f9f8b69fab7107de4826 | |
| parent | df78b1665836e87d4f128c2e46c898d1cb89dc2a (diff) | |
| download | samba-02b223ced398f40a016db83d41ad1581512002d1.tar.gz | |
s3:smb2_negprot: add support for negotiating SMB 3.0.2
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 | 3 | ||||
| -rw-r--r-- | source3/smbd/smb2_negprot.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml index 41532a984f2..dcc78f25732 100644 --- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml @@ -49,6 +49,9 @@ <listitem> <para><constant>SMB3_00</constant>: Windows 8 SMB3 version. (mostly the same as SMB2_24)</para> </listitem> + <listitem> + <para><constant>SMB3_02</constant>: Windows 8.1 SMB3 version.</para> + </listitem> </itemizedlist> <para>By default SMB3 selects the SMB3_00 variant.</para> </listitem> diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 998796706b6..ae2f3f7d53e 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -91,6 +91,7 @@ enum protocol_types smbd_smb2_protocol_dialect_match(const uint8_t *indyn, enum protocol_types proto; uint16_t dialect; } pd[] = { + { PROTOCOL_SMB3_02, SMB3_DIALECT_REVISION_302 }, { PROTOCOL_SMB3_00, SMB3_DIALECT_REVISION_300 }, { PROTOCOL_SMB2_24, SMB2_DIALECT_REVISION_224 }, { PROTOCOL_SMB2_22, SMB2_DIALECT_REVISION_222 }, |