From 00cd9ca64a5d41295c53f9013186864e4394880b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 11 Jul 2011 22:22:49 +0200 Subject: [PATCH] s3:loadparm: use PROTOCOL_SMB2_02 instead of PROTOCOL_SMB2 metze --- source3/param/loadparm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index e339a911c38..79f1b236cad 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"); -- 2.11.4.GIT