summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-08-05 16:22:48 +0200
committerVolker Lendecke <vl@samba.org>2011-08-25 21:36:18 +0200
commit4cb6e1284c362aa0eabdb7d4f964390a0a455bd3 (patch)
tree2f1ab7f45fa810cccc6170c2d694c7381ce77505
parent16888be44a9d75f2770e4e7271d4a8d1b3e837f1 (diff)
downloadsamba-4cb6e1284c362aa0eabdb7d4f964390a0a455bd3.tar.gz
samba-4cb6e1284c362aa0eabdb7d4f964390a0a455bd3.tar.bz2
samba-4cb6e1284c362aa0eabdb7d4f964390a0a455bd3.zip
s3: Explicitly pass smb_srv_trans_enc_ctx to srv_enc_ctx
-rw-r--r--source3/smbd/seal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index fa25cadf60..1b9b3b07df 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -46,9 +46,9 @@ struct smb_srv_trans_enc_ctx {
Return global enc context - this must change if we ever do multiple contexts.
******************************************************************************/
-static uint16_t srv_enc_ctx(void)
+static uint16_t srv_enc_ctx(const struct smb_srv_trans_enc_ctx *ec)
{
- return srv_trans_enc_ctx->es->enc_ctx_num;
+ return ec->es->enc_ctx_num;
}
/******************************************************************************
@@ -73,7 +73,7 @@ bool is_encrypted_packet(const uint8_t *inbuf)
}
/* Encrypted messages are 0xFF'E'<ctx> */
- if (srv_trans_enc_ctx && enc_num == srv_enc_ctx()) {
+ if (srv_trans_enc_ctx && enc_num == srv_enc_ctx(srv_trans_enc_ctx)) {
return true;
}
return false;