summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-07-11 22:22:49 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-12 08:17:59 +0200
commit00cd9ca64a5d41295c53f9013186864e4394880b (patch)
tree7b60d06e5b0a58dabe072652a62d7727500cdd25 /source3/param
parentcc2a5d23ae895a07d6f5f25a7273beaa721bb788 (diff)
downloadsamba-00cd9ca64a5d41295c53f9013186864e4394880b.tar.gz
samba-00cd9ca64a5d41295c53f9013186864e4394880b.tar.bz2
samba-00cd9ca64a5d41295c53f9013186864e4394880b.zip
s3:loadparm: use PROTOCOL_SMB2_02 instead of PROTOCOL_SMB2
metze
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e339a911c3..79f1b236ca 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, "SMB2"},
+ {PROTOCOL_SMB2_02, "SMB2"},
+ {PROTOCOL_SMB2_02, "SMB2_02"},
{PROTOCOL_NT1, "NT1"},
{PROTOCOL_LANMAN2, "LANMAN2"},
{PROTOCOL_LANMAN1, "LANMAN1"},
@@ -5321,7 +5322,7 @@ static FN_GLOBAL_INTEGER(_lp_maxprotocol, maxprotocol)
int lp_maxprotocol(void)
{
int ret = _lp_maxprotocol();
- if ((ret == PROTOCOL_SMB2) && (lp_security() == SEC_SHARE)) {
+ if ((ret >= PROTOCOL_SMB2_02) && (lp_security() == SEC_SHARE)) {
DEBUG(2,("WARNING!!: \"security = share\" is incompatible "
"with the SMB2 protocol. Resetting to SMB1.\n" ));
lp_do_parameter(-1, "max protocol", "NT1");