From 880d2e18e13a50d4bcca9824590901a4fb8443b9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Nov 2020 15:14:12 +0100 Subject: [PATCH] s3:smbd: replace PROTOCOL_SMB2_24 with PROTOCOL_SMB3_00 Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- source3/smbd/smb2_negprot.c | 4 ++-- source3/smbd/smb2_server.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 950a00e453d..7e1c04abf12 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -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; diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 4e0ab1630ea..57a1085e11e 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -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));