diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-09-05 13:14:40 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-09-05 19:30:58 +0200 |
commit | 012c9d06a94b532377e9e96f60b20b5f0975af74 (patch) | |
tree | 0065c2161af15c9cf92c23e1fb931bc838e71a14 /source3/param | |
parent | 1c8e8c7e7b4cc00628b91e2e0596bfa428a2bcdb (diff) | |
download | samba-012c9d06a94b532377e9e96f60b20b5f0975af74.tar.gz samba-012c9d06a94b532377e9e96f60b20b5f0975af74.tar.bz2 samba-012c9d06a94b532377e9e96f60b20b5f0975af74.zip |
s3:smb2_server: add basic support for SMB 2.1
This adds support for the 2 stage negprot, from SMB 1 to SMB 2.1.
Support for this of for now and "max protocol = SMB2" still maps
to "max protocol = SMB2_02" PROTOCOL_SMB2_02.
In order to activate smb2.1, you need to use "max protocol = SMB2_10".
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Sep 5 19:30:58 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/param')
-rw-r--r-- | source3/param/loadparm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b0c64c7fa3..305ff2cec9 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -312,7 +312,8 @@ static void add_to_file_list(const char *fname, const char *subfname); static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmValue, bool store_values); static const struct enum_list enum_protocol[] = { - {PROTOCOL_SMB2_02, "SMB2"}, + {PROTOCOL_SMB2_02, "SMB2"}, /* for now keep PROTOCOL_SMB2_02 */ + {PROTOCOL_SMB2_10, "SMB2_10"}, {PROTOCOL_SMB2_02, "SMB2_02"}, {PROTOCOL_NT1, "NT1"}, {PROTOCOL_LANMAN2, "LANMAN2"}, |