summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-06-12 15:10:11 +0200
committerKarolin Seeger <kseeger@samba.org>2014-12-18 20:50:08 +0100
commit7aacb3cc5c877f26db0539791b9750389caa1fe1 (patch)
treecb24d0afb98b01edce36706f4c19834aa92919d5
parentb1ecde9c9a1a7279d2f68cf970f374846ff6d45e (diff)
downloadsamba-7aacb3cc5c877f26db0539791b9750389caa1fe1.tar.gz
s3:smb2_server: use the global signing key to check if signing is required
If we have a channel session key, we also always have a global session key. For multi-channel it's possible that the channel session key is not in place yet, in that case the global session key needs to be used. In both cases (reauth or session bind) we session setup requests need to be signed. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> (cherry picked from commit 7e006d11134cdc37ea0fc13110fe5bbfb9de3f14)
-rw-r--r--source3/smbd/smb2_server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 58eddee54a3..2a03b7cd823 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1912,7 +1912,7 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
encryption_required = x->global->encryption_required;
if (opcode == SMB2_OP_SESSSETUP &&
- x->global->channels[0].signing_key.length) {
+ x->global->signing_key.length > 0) {
signing_required = true;
}
}