diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-11 22:23:56 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-12 08:18:00 +0200 |
| commit | aca920b27c15c2c90f7baf41042a66fa556abe80 (patch) | |
| tree | 8fc80869a0c60907f7ab8d10337304275fe2fcbf | |
| parent | 00cd9ca64a5d41295c53f9013186864e4394880b (diff) | |
| download | samba-aca920b27c15c2c90f7baf41042a66fa556abe80.tar.gz samba-aca920b27c15c2c90f7baf41042a66fa556abe80.tar.bz2 samba-aca920b27c15c2c90f7baf41042a66fa556abe80.zip | |
s3:smbd: use PROTOCOL_SMB2_02 instead PROTOCOL_SMB2
metze
| -rw-r--r-- | source3/smbd/negprot.c | 2 | ||||
| -rw-r--r-- | source3/smbd/process.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_negprot.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index a6d7cc0ab3..f1d2fc2545 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -510,7 +510,7 @@ static const struct { void (*proto_reply_fn)(struct smb_request *req, uint16 choice); int protocol_level; } supported_protocols[] = { - {"SMB 2.002", "SMB2", reply_smb2002, PROTOCOL_SMB2}, + {"SMB 2.002", "SMB2_02", reply_smb2002, PROTOCOL_SMB2_02}, {"NT LANMAN 1.0", "NT1", reply_nt1, PROTOCOL_NT1}, {"NT LM 0.12", "NT1", reply_nt1, PROTOCOL_NT1}, {"POSIX 2", "NT1", reply_nt1, PROTOCOL_NT1}, diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 339d005b42..d3957fe936 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -2836,7 +2836,7 @@ void smbd_process(struct smbd_server_connection *sconn) char *rhost; int ret; - if (lp_maxprotocol() == PROTOCOL_SMB2) { + if (lp_maxprotocol() >= PROTOCOL_SMB2_02) { /* * We're not making the decision here, * we're just allowing the client diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index f639503ad4..5ae916397b 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -113,7 +113,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); } - set_Protocol(PROTOCOL_SMB2); + set_Protocol(PROTOCOL_SMB2_02); if (get_remote_arch() != RA_SAMBA) { set_remote_arch(RA_VISTA); |