sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:smbd: replace PROTOCOL_SMB2_24 with PROTOCOL_SMB3_00

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2020-11-11 15:14:12 +01:00
parent 8c05c97943
commit 880d2e18e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/smb2_negprot.c
View File

@ -337,7 +337,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
capabilities |= SMB2_CAP_LEASING;
}
if ((protocol >= PROTOCOL_SMB2_24) &&
if ((protocol >= PROTOCOL_SMB3_00) &&
(lp_server_smb_encrypt(-1) != SMB_ENCRYPTION_OFF) &&
(in_capabilities & SMB2_CAP_ENCRYPTION)) {
capabilities |= SMB2_CAP_ENCRYPTION;
@ -449,7 +449,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
req->preauth = &req->xconn->smb2.preauth;
}
if (protocol >= PROTOCOL_SMB2_24) {
if (protocol >= PROTOCOL_SMB3_00) {
xconn->smb2.server.sign_algo = SMB2_SIGNING_AES128_CMAC;
} else {
xconn->smb2.server.sign_algo = SMB2_SIGNING_HMAC_SHA256;

2
source3/smbd/smb2_server.c
View File

@ -399,7 +399,7 @@ static NTSTATUS smbd_smb2_inbuf_parse_compound(struct smbXsrv_connection *xconn,
NTSTATUS status;
size_t enc_len;
if (xconn->protocol < PROTOCOL_SMB2_24) {
if (xconn->protocol < PROTOCOL_SMB3_00) {
DEBUG(10, ("Got SMB2_TRANSFORM header, "
"but dialect[0x%04X] is used\n",
xconn->smb2.server.dialect));