diff options
| author | Volker Lendecke <vl@samba.org> | 2011-08-05 16:58:51 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-08-25 21:36:19 +0200 |
| commit | d4c4705e5593a8f048da406fff596229d31d4151 (patch) | |
| tree | 9a6aad3adeaa4f51da5760e7d792ffbe60ab5349 | |
| parent | 08262fe9647f961bfb2b1eb2b7b9e8ed0318e466 (diff) | |
| download | samba-d4c4705e5593a8f048da406fff596229d31d4151.tar.gz samba-d4c4705e5593a8f048da406fff596229d31d4151.tar.bz2 samba-d4c4705e5593a8f048da406fff596229d31d4151.zip | |
s3: Pass smbd_server_connection to srv_decrypt_buffer
| -rw-r--r-- | source3/smbd/process.c | 2 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 3 | ||||
| -rw-r--r-- | source3/smbd/seal.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index c2ce867b6e..76f0e06cfe 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -465,7 +465,7 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx, } if (is_encrypted_packet(sconn, (uint8_t *)*buffer)) { - status = srv_decrypt_buffer(*buffer); + status = srv_decrypt_buffer(sconn, *buffer); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("receive_smb_talloc: SMB decryption failed on " "incoming packet! Error %s\n", diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index b8e9557560..efbaa2ee89 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -48,7 +48,6 @@ /* The following definitions come from smbd/signing.c */ -struct smbd_server_connection; bool srv_check_sign_mac(struct smbd_server_connection *conn, const char *inbuf, uint32_t *seqnum, bool trusted_channel); void srv_calculate_sign_mac(struct smbd_server_connection *conn, @@ -940,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(struct smbd_server_connection *sconn, char *buf); -NTSTATUS srv_decrypt_buffer(char *buf); +NTSTATUS srv_decrypt_buffer(struct smbd_server_connection *sconn, char *buf); NTSTATUS srv_encrypt_buffer(char *buf, char **buf_out); NTSTATUS srv_request_encryption_setup(connection_struct *conn, unsigned char **ppdata, diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index 7ec8c2d75f..2883b4e55d 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -343,7 +343,7 @@ void srv_free_enc_buffer(struct smbd_server_connection *sconn, char *buf) Decrypt an incoming buffer. ******************************************************************************/ -NTSTATUS srv_decrypt_buffer(char *buf) +NTSTATUS srv_decrypt_buffer(struct smbd_server_connection *sconn, char *buf) { /* Ignore non-session messages. */ if(CVAL(buf,0)) { |