]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: Slightly simplify smbd_smb2_request_process_negprot
authorVolker Lendecke <vl@samba.org>
Wed, 12 Sep 2012 14:43:36 +0000 (16:43 +0200)
committerVolker Lendecke <vl@samba.org>
Tue, 25 Sep 2012 20:41:51 +0000 (22:41 +0200)
Remove a nested if-statement

source3/smbd/smb2_negprot.c

index 11ec2a5eff4dda7ac65159bface61ffbc22e887a..6adc5819ecd92f5c3a249f87b294343246cbffe8 100644 (file)
@@ -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;
        }
 
        /*