From: Volker Lendecke <vl@samba.org>
Date: Wed, 12 Sep 2012 14:43:36 +0000 (+0200)
Subject: s3: Slightly simplify smbd_smb2_request_process_negprot
X-Git-Tag: talloc-2.0.8~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0de443af80ee6231f4deddc5c7b4534d8c11f83;p=thirdparty%2Fsamba.git

s3: Slightly simplify smbd_smb2_request_process_negprot

Remove a nested if-statement
---

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;
 	}
 
 	/*