diff options
author | Volker Lendecke <vl@samba.org> | 2011-08-05 16:52:25 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2011-08-25 21:36:19 +0200 |
commit | 08262fe9647f961bfb2b1eb2b7b9e8ed0318e466 (patch) | |
tree | 87808b44a4f753a255b5579e4bfb58203ddbca23 | |
parent | f9ef138ec7a7a6507e0bd9d7d8753027c002b562 (diff) | |
download | samba-08262fe9647f961bfb2b1eb2b7b9e8ed0318e466.tar.gz samba-08262fe9647f961bfb2b1eb2b7b9e8ed0318e466.tar.bz2 samba-08262fe9647f961bfb2b1eb2b7b9e8ed0318e466.zip |
s3: Pass smbd_server_connection to srv_free_enc_buffer
-rw-r--r-- | source3/smbd/process.c | 4 | ||||
-rw-r--r-- | source3/smbd/proto.h | 2 | ||||
-rw-r--r-- | source3/smbd/seal.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 7e3c5f6734..c2ce867b6e 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -168,12 +168,12 @@ bool srv_send_smb(struct smbd_server_connection *sconn, char *buffer, get_peer_addr(sconn->sock, addr, sizeof(addr)), (int)ret, strerror(errno) )); - srv_free_enc_buffer(buf_out); + srv_free_enc_buffer(sconn, buf_out); goto out; } SMB_PERFCOUNT_SET_MSGLEN_OUT(pcd, len); - srv_free_enc_buffer(buf_out); + srv_free_enc_buffer(sconn, buf_out); out: SMB_PERFCOUNT_END(pcd); diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 0f4036f574..b8e9557560 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -939,7 +939,7 @@ void reply_getattrE(struct smb_request *req); bool is_encrypted_packet(struct smbd_server_connection *sconn, const uint8_t *inbuf); -void srv_free_enc_buffer(char *buf); +void srv_free_enc_buffer(struct smbd_server_connection *sconn, char *buf); NTSTATUS srv_decrypt_buffer(char *buf); NTSTATUS srv_encrypt_buffer(char *buf, char **buf_out); NTSTATUS srv_request_encryption_setup(connection_struct *conn, diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index 6a1b056aac..7ec8c2d75f 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -324,7 +324,7 @@ static NTSTATUS make_srv_encryption_context(const struct tsocket_address *remote Free an encryption-allocated buffer. ******************************************************************************/ -void srv_free_enc_buffer(char *buf) +void srv_free_enc_buffer(struct smbd_server_connection *sconn, char *buf) { /* We know this is an smb buffer, and we * didn't malloc, only copy, for a keepalive, |