summaryrefslogtreecommitdiff
path: root/source3/smbd/globals.h
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2015-07-01 17:42:58 +0200
committerGünther Deschner <gd@samba.org>2015-07-07 14:05:27 +0200
commit3bb299944391633c45d87d5e8ad48c2c14428592 (patch)
treed67603c22bfb38db7b29518dec053567e70640af /source3/smbd/globals.h
parenta3ea6dbef53e049701326497e684e1563344e6d8 (diff)
downloadsamba-3bb299944391633c45d87d5e8ad48c2c14428592.tar.gz
smbd:smb2: separate between encryption required and enc desired
this means we: - accept unencrypted requests if encryption only desired and not required, - but we always send encrypted responses in the desired case, not only when the request was encrypted. For this purpose, the do_encryption in the request structure is separated into was_encrypted and do_encryption. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11372 Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source3/smbd/globals.h')
-rw-r--r--source3/smbd/globals.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 3ddafafa49b..2ca23aa37d1 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -654,6 +654,9 @@ struct smbd_smb2_request {
int current_idx;
bool do_signing;
+ /* Was the request encrypted? */
+ bool was_encrypted;
+ /* Should we encrypt? */
bool do_encryption;
struct tevent_timer *async_te;
bool compound_related;