The branch, master has been updated
via 1d15fc7 Fix bug #9724 - is_encrypted_packet() function incorrectly
used inside server.
from fd8b258 examples/libsmbclient: Cast mode_t to unsigned int for
GNU/Solaris build
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1d15fc75a33b7368049876368f4b70c188bbd55e
Author: Jeremy Allison <[email protected]>
Date: Fri Mar 15 15:05:31 2013 -0700
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 <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Sat Mar 16 12:44:44 CET 2013 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/reply.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 64c4fdb..2c31f15 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) ) {
--
Samba Shared Repository
