diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-09-05 13:08:36 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-09-05 13:17:33 +0200 |
| commit | d9c2aaa0008d6e3f52b6e9b47366c052ab8df9f0 (patch) | |
| tree | 85a834a07044fb415cca0f8ea412d2f65d10bded | |
| parent | b4893885098fb4d2094a0417e0b9700a329bc8ac (diff) | |
| download | samba-d9c2aaa0008d6e3f52b6e9b47366c052ab8df9f0.tar.gz samba-d9c2aaa0008d6e3f52b6e9b47366c052ab8df9f0.tar.bz2 samba-d9c2aaa0008d6e3f52b6e9b47366c052ab8df9f0.zip | |
s4:smb_server: make use of PROTOCOL_SMB2_02
metze
| -rw-r--r-- | source4/smb_server/smb/negprot.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb2/negprot.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c index 0a07ab93e2..378330ff28 100644 --- a/source4/smb_server/smb/negprot.c +++ b/source4/smb_server/smb/negprot.c @@ -465,7 +465,7 @@ static const struct { void (*proto_reply_fn)(struct smbsrv_request *req, uint16_t choice); int protocol_level; } supported_protocols[] = { - {"SMB 2.002", "SMB2", reply_smb2, PROTOCOL_SMB2}, + {"SMB 2.002", "SMB2", reply_smb2, PROTOCOL_SMB2_02}, {"NT LANMAN 1.0", "NT1", reply_nt1, PROTOCOL_NT1}, {"NT LM 0.12", "NT1", reply_nt1, PROTOCOL_NT1}, {"LANMAN2.1", "LANMAN2", reply_lanman2, PROTOCOL_LANMAN2}, diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c index da60676322..bc896aa924 100644 --- a/source4/smb_server/smb2/negprot.c +++ b/source4/smb_server/smb2/negprot.c @@ -113,7 +113,7 @@ static NTSTATUS smb2srv_negprot_backend(struct smb2srv_request *req, struct smb2 return NT_STATUS_NOT_SUPPORTED; } - req->smb_conn->negotiate.protocol = PROTOCOL_SMB2; + req->smb_conn->negotiate.protocol = PROTOCOL_SMB2_02; current_time = timeval_current(); /* TODO: handle timezone?! */ boot_time = timeval_current(); /* TODO: fix me */ diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index d64a597d31..270e107c06 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -63,7 +63,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private_data, 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 (lpcfg_srv_maxprotocol(smb_conn->lp_ctx) < PROTOCOL_SMB2) break; + if (lpcfg_srv_maxprotocol(smb_conn->lp_ctx) < PROTOCOL_SMB2_02) break; status = smbsrv_init_smb2_connection(smb_conn); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); |