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/smb_server/smb_server.c | |
| 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/smb_server/smb_server.c')
| -rw-r--r-- | source4/smb_server/smb_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6740db4923..6e517cd386 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -56,14 +56,14 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); case SMB2_MAGIC: - if (!lp_parm_bool(-1, "smbsrv", "enable smb2", False)) break; + if (lp_maxprotocol() < PROTOCOL_SMB2) break; status = smbsrv_init_smb2_connection(smb_conn); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); return smbsrv_recv_smb2_request(smb_conn, blob); } - DEBUG(2,("Invalid SMB packet: protocl prefix: 0x%08X\n", protocol_version)); + DEBUG(2,("Invalid SMB packet: protocol prefix: 0x%08X\n", protocol_version)); smbsrv_terminate_connection(smb_conn, "NON-SMB packet"); return NT_STATUS_OK; } |