s3:smbd: remove unused 'sconn' from is_encrypted_packet()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 5f07275f15f04581f35f96235572ca167f9965b2..8caa7d2a7de430b267bd7bd79881c69523edb6ec 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -299,7 +299,7 @@ int srv_set_message(char *buf,
 static bool valid_smb_header(struct smbd_server_connection *sconn,
                             const uint8_t *inbuf)
 {
-       if (is_encrypted_packet(sconn, inbuf)) {
+       if (is_encrypted_packet(inbuf)) {
                return true;
        }
        /*
@@ -564,7 +564,7 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx,
                return status;
        }
 
-       if (is_encrypted_packet(sconn, (uint8_t *)*buffer)) {
+       if (is_encrypted_packet((uint8_t *)*buffer)) {
                status = srv_decrypt_buffer(sconn, *buffer);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0, ("receive_smb_talloc: SMB decryption failed on "

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 74c9950bed61529a6e0dbc0c281c680157622ea1..3dea578a262d1f3d8b814f5b62b9482d55364b25 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -927,8 +927,7 @@ void reply_getattrE(struct smb_request *req);
 
 /* The following definitions come from smbd/seal.c  */
 
-bool is_encrypted_packet(struct smbd_server_connection *sconn,
-                        const uint8_t *inbuf);
+bool is_encrypted_packet(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(struct smbd_server_connection *sconn, char *buf,

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 9722307f53695127bf38cc1e84a057e8f39688e2..22e06f2c79fae665d09e9536f164e49567afd022 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4628,7 +4628,7 @@ bool is_valid_writeX_buffer(struct smbd_server_connection *sconn,
        struct files_struct *fsp = NULL;
        NTSTATUS status;
 
-       if (is_encrypted_packet(sconn, inbuf)) {
+       if (is_encrypted_packet(inbuf)) {
                /* Can't do this on encrypted
                 * connections. */
                return false;

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 273013b4279e44d9967c27e9d5032d152b23fd11..7ab992ea7b148943b1e468936b0c9ffa1f271bd2 100644 (file)
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -45,8 +45,7 @@ static uint16_t srv_enc_ctx(const struct smb_trans_enc_state *es)
  Is this an incoming encrypted packet ?
 ******************************************************************************/
 
-bool is_encrypted_packet(struct smbd_server_connection *sconn,
-                        const uint8_t *inbuf)
+bool is_encrypted_packet(const uint8_t *inbuf)
 {
        NTSTATUS status;
        uint16_t enc_num;