From: Volker Lendecke <vl@samba.org>
Date: Fri, 5 Aug 2011 15:00:42 +0000 (+0200)
Subject: s3: Pass smbd_server_connection to srv_encrypt_buffer
X-Git-Tag: samba-4.0.0alpha17~340
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=7e70f85350c81f2b820d83da0d5d3ea46655e219;p=ira%2Fwip.git

s3: Pass smbd_server_connection to srv_encrypt_buffer
---

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 76f0e06cfee..a60d77e5c67 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 efbaa2ee893..646a00678d5 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 2883b4e55df..20d97133ff4 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;