From e0de443af80ee6231f4deddc5c7b4534d8c11f83 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 12 Sep 2012 16:43:36 +0200 Subject: [PATCH] s3: Slightly simplify smbd_smb2_request_process_negprot Remove a nested if-statement --- source3/smbd/smb2_negprot.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 11ec2a5eff4..6adc5819ecd 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -255,11 +255,9 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) } if ((protocol >= PROTOCOL_SMB2_24) && - (lp_smb_encrypt(-1) != SMB_SIGNING_OFF)) - { - if (in_capabilities & SMB2_CAP_ENCRYPTION) { - capabilities |= SMB2_CAP_ENCRYPTION; - } + (lp_smb_encrypt(-1) != SMB_SIGNING_OFF) && + (in_capabilities & SMB2_CAP_ENCRYPTION)) { + capabilities |= SMB2_CAP_ENCRYPTION; } /* -- 2.34.1