diff options
| author | Volker Lendecke <vl@samba.org> | 2012-09-12 16:43:36 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2012-09-25 22:41:51 +0200 |
| commit | e0de443af80ee6231f4deddc5c7b4534d8c11f83 (patch) | |
| tree | e099e04e5d931ac22adef5670bf42a23b2d5fca1 | |
| parent | 1b403d46c7a94645c72fead6758d81f5b20298cc (diff) | |
| download | samba-e0de443af80ee6231f4deddc5c7b4534d8c11f83.tar.gz samba-e0de443af80ee6231f4deddc5c7b4534d8c11f83.tar.bz2 samba-e0de443af80ee6231f4deddc5c7b4534d8c11f83.zip | |
s3: Slightly simplify smbd_smb2_request_process_negprot
Remove a nested if-statement
| -rw-r--r-- | source3/smbd/smb2_negprot.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 11ec2a5eff..6adc5819ec 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; } /* |