summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-08-05 17:00:42 +0200
committerVolker Lendecke <vl@samba.org>2011-08-25 21:36:19 +0200
commit7e70f85350c81f2b820d83da0d5d3ea46655e219 (patch)
tree764e3eabc634f14ebf1a9b3add2317b1b2a32bcb
parentd4c4705e5593a8f048da406fff596229d31d4151 (diff)
downloadsamba-7e70f85350c81f2b820d83da0d5d3ea46655e219.tar.gz
samba-7e70f85350c81f2b820d83da0d5d3ea46655e219.tar.bz2
samba-7e70f85350c81f2b820d83da0d5d3ea46655e219.zip
s3: Pass smbd_server_connection to srv_encrypt_buffer
-rw-r--r--source3/smbd/process.c2
-rw-r--r--source3/smbd/proto.h3
-rw-r--r--source3/smbd/seal.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 76f0e06cfe..a60d77e5c6 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -144,7 +144,7 @@ bool srv_send_smb(struct smbd_server_connection *sconn, char *buffer,
}
if (do_encrypt) {
- NTSTATUS status = srv_encrypt_buffer(buffer, &buf_out);
+ NTSTATUS status = srv_encrypt_buffer(sconn, buffer, &buf_out);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("send_smb: SMB encryption failed "
"on outgoing packet! Error %s\n",
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index efbaa2ee89..646a00678d 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -940,7 +940,8 @@ bool is_encrypted_packet(struct smbd_server_connection *sconn,
const uint8_t *inbuf);
void srv_free_enc_buffer(struct smbd_server_connection *sconn, char *buf);
NTSTATUS srv_decrypt_buffer(struct smbd_server_connection *sconn, char *buf);
-NTSTATUS srv_encrypt_buffer(char *buf, char **buf_out);
+NTSTATUS srv_encrypt_buffer(struct smbd_server_connection *sconn, char *buf,
+ char **buf_out);
NTSTATUS srv_request_encryption_setup(connection_struct *conn,
unsigned char **ppdata,
size_t *p_data_size,
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 2883b4e55d..20d97133ff 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -361,7 +361,8 @@ NTSTATUS srv_decrypt_buffer(struct smbd_server_connection *sconn, char *buf)
Encrypt an outgoing buffer. Return the encrypted pointer in buf_out.
******************************************************************************/
-NTSTATUS srv_encrypt_buffer(char *buf, char **buf_out)
+NTSTATUS srv_encrypt_buffer(struct smbd_server_connection *sconn, char *buf,
+ char **buf_out)
{
*buf_out = buf;