[SCM] Samba Shared Repository - branch v3-6-test updated
Jeremy Allison
jra at samba.org
Wed Sep 8 21:55:31 MDT 2010
The branch, v3-6-test has been updated
via b438cee Don't rely on the underlying ACL modules to enforce share level security when setting ACLs, check at the call level as well.
from be16d26 Optimization suggested by Metze. Without this patch, FindFirst with 'path o\some\dir\withiles\*'
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit b438cee11949bd73a6a68375a33b8178ed9c7e77
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 8 20:54:38 2010 -0700
Don't rely on the underlying ACL modules to enforce share level
security when setting ACLs, check at the call level as well.
Jeremy.
(cherry picked from commit bec9baf88a54d0e0d3fe1065c27df0f76c960e65)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/nttrans.c | 5 +++++
source3/smbd/smb2_setinfo.c | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 839d1b3..09aafda 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1966,6 +1966,11 @@ static void call_nt_transact_set_security_desc(connection_struct *conn,
return;
}
+ if (!CAN_WRITE(fsp->conn)) {
+ reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+ return;
+ }
+
if(!lp_nt_acl_support(SNUM(conn))) {
goto done;
}
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 3e1bdd2..4b837c1 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -311,6 +311,11 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
case 0x03:/* SMB2_SETINFO_SECURITY */
{
+ if (!CAN_WRITE(conn)) {
+ tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
+ return tevent_req_post(req, ev);
+ }
+
status = set_sd(fsp,
in_input_buffer.data,
in_input_buffer.length,
--
Samba Shared Repository
More information about the samba-cvs
mailing list