diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-06 14:19:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:17 -0500 |
| commit | d8503c6ba120172e9aae737c5510e547e8dea4a5 (patch) | |
| tree | ae8ee4e9b792fedbb7259bf1ffc132e657bbb8d1 /source4/param | |
| parent | 1c49d8f794762d0f3828237961012761212cb37e (diff) | |
| download | samba-d8503c6ba120172e9aae737c5510e547e8dea4a5.tar.gz samba-d8503c6ba120172e9aae737c5510e547e8dea4a5.tar.bz2 samba-d8503c6ba120172e9aae737c5510e547e8dea4a5.zip | |
r13860: - add support for SMB2 ("SMB 2.001") negotiation in SMB negprot requests
- the default max protocol is still NT1
metze
(This used to be commit d1bae931b327dda28e648efc473e0462cf036f7c)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 8fc061b53f..16692daec4 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -279,6 +279,7 @@ static BOOL handle_copy(const char *pszParmValue, char **ptr); static void set_default_server_announce_type(void); static const struct enum_list enum_protocol[] = { + {PROTOCOL_SMB2, "SMB2"}, {PROTOCOL_NT1, "NT1"}, {PROTOCOL_LANMAN2, "LANMAN2"}, {PROTOCOL_LANMAN1, "LANMAN1"}, @@ -595,7 +596,6 @@ static void init_globals(void) myname = get_myname(); do_parameter("netbios name", myname, NULL); SAFE_FREE(myname); - do_parameter("max protocol", "NT1", NULL); do_parameter("name resolve order", "lmhosts wins host bcast", NULL); do_parameter("fstype", FSTYPE_STRING, NULL); @@ -646,7 +646,8 @@ static void init_globals(void) do_parameter("max xmit", "12288", NULL); do_parameter("password level", "0", NULL); do_parameter("LargeReadwrite", "True", NULL); - do_parameter("minprotocol", "CORE", NULL); + do_parameter("min protocol", "CORE", NULL); + do_parameter("max protocol", "NT1", NULL); do_parameter("security", "USER", NULL); do_parameter("paranoid server security", "True", NULL); do_parameter("EncryptPasswords", "True", NULL); |