diff options
| author | Jeremy Allison <jra@samba.org> | 2013-03-15 15:05:31 -0700 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-03-16 12:44:44 +0100 |
| commit | 1d15fc75a33b7368049876368f4b70c188bbd55e (patch) | |
| tree | b90f43a3a71d61dfaaef1d2d15d11b4087ca46bd /source3/smbd/reply.c | |
| parent | fd8b258fa20496c3e6360248503f59704d206742 (diff) | |
| download | samba-1d15fc75a33b7368049876368f4b70c188bbd55e.tar.gz samba-1d15fc75a33b7368049876368f4b70c188bbd55e.tar.bz2 samba-1d15fc75a33b7368049876368f4b70c188bbd55e.zip | |
Fix bug #9724 - is_encrypted_packet() function incorrectly used inside server.
The is_encrypted_packet() function should only be used on the raw received data
to determine if a packet came in encrypted. Once we're inside the SMB1
processing code in smbd/reply.c we should be looking at the
smb1request->encrypted field to determine if a packet was really encrypted or
not.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sat Mar 16 12:44:44 CET 2013 on sn-devel-104
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 64c4fdbe59..2c31f15917 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3294,8 +3294,7 @@ void reply_readbraw(struct smb_request *req) START_PROFILE(SMBreadbraw); - if (srv_is_signing_active(sconn) || - is_encrypted_packet(sconn, req->inbuf)) { + if (srv_is_signing_active(sconn) || req->encrypted) { exit_server_cleanly("reply_readbraw: SMB signing/sealing is active - " "raw reads/writes are disallowed."); } @@ -3698,7 +3697,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, */ if (!req_is_in_chain(req) && - !is_encrypted_packet(req->sconn, req->inbuf) && + !req->encrypted && (fsp->base_fsp == NULL) && (fsp->wcp == NULL) && lp_use_sendfile(SNUM(conn), req->sconn->smb1.signing_state) ) { |